From 9d29a481519e2e78dbd0d1288703939b94d4a427 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 7 Apr 2022 16:52:22 +0200 Subject: [PATCH] SEBSERV-160 implemented state change batch action --- .../ch/ethz/seb/sebserver/gbl/api/API.java | 2 + .../seb/sebserver/gbl/api/EntityType.java | 2 +- .../seb/sebserver/gbl/api/POSTMapper.java | 10 + .../seb/sebserver/gbl/model/BatchAction.java | 67 +++- .../ethz/seb/sebserver/gbl/model/Domain.java | 3 +- .../sebserver/gbl/model/EntityDependency.java | 7 +- .../ethz/seb/sebserver/gbl/util/Result.java | 6 +- .../gui/content/action/ActionDefinition.java | 6 + .../configs/CertificateImportPopup.java | 4 - .../configs/SEBExamConfigCreationPopup.java | 18 +- .../content/configs/SEBExamConfigList.java | 16 +- .../SEBExamConfigStateChangePopup.java | 117 +++++++ .../MonitoringClientConnection.java | 5 +- .../page/AbstractBatchActionWizard.java | 289 ++++++++++++++++++ .../gui/service/page/PageService.java | 12 +- .../service/page/impl/ModalInputWizard.java | 4 +- .../service/page/impl/PageServiceImpl.java | 9 +- .../webservice/api/batch/DoBatchAction.java | 40 +++ .../webservice/api/batch/GetBatchAction.java | 41 +++ .../seb/sebserver/gui/table/EntityTable.java | 95 ++++-- .../seb/sebserver/gui/table/TableBuilder.java | 3 +- .../seb/sebserver/gui/table/TableFilter.java | 3 +- ...ionalAttributeRecordDynamicSqlSupport.java | 14 +- .../AdditionalAttributeRecordMapper.java | 36 +-- .../BatchActionRecordDynamicSqlSupport.java | 25 +- .../batis/mapper/BatchActionRecordMapper.java | 50 +-- .../CertificateRecordDynamicSqlSupport.java | 12 +- .../batis/mapper/CertificateRecordMapper.java | 36 +-- ...ientConnectionRecordDynamicSqlSupport.java | 38 +-- .../mapper/ClientConnectionRecordMapper.java | 36 +-- .../ClientEventRecordDynamicSqlSupport.java | 18 +- .../batis/mapper/ClientEventRecordMapper.java | 36 +-- ...lientIndicatorRecordDynamicSqlSupport.java | 12 +- .../mapper/ClientIndicatorRecordMapper.java | 36 +-- ...entInstructionRecordDynamicSqlSupport.java | 18 +- .../mapper/ClientInstructionRecordMapper.java | 36 +-- ...ntNotificationRecordDynamicSqlSupport.java | 16 +- .../ClientNotificationRecordMapper.java | 36 +-- ...ationAttributeRecordDynamicSqlSupport.java | 20 +- .../ConfigurationAttributeRecordMapper.java | 36 +-- ...figurationNodeRecordDynamicSqlSupport.java | 20 +- .../mapper/ConfigurationNodeRecordMapper.java | 36 +-- .../ConfigurationRecordDynamicSqlSupport.java | 16 +- .../mapper/ConfigurationRecordMapper.java | 36 +-- ...igurationValueRecordDynamicSqlSupport.java | 16 +- .../ConfigurationValueRecordMapper.java | 36 +-- ...nfigurationMapRecordDynamicSqlSupport.java | 16 +- .../ExamConfigurationMapRecordMapper.java | 36 +-- .../mapper/ExamRecordDynamicSqlSupport.java | 36 +-- .../batis/mapper/ExamRecordMapper.java | 36 +-- .../ExamTemplateRecordDynamicSqlSupport.java | 22 +- .../mapper/ExamTemplateRecordMapper.java | 36 +-- .../IndicatorRecordDynamicSqlSupport.java | 18 +- .../batis/mapper/IndicatorRecordMapper.java | 36 +-- .../InstitutionRecordDynamicSqlSupport.java | 16 +- .../batis/mapper/InstitutionRecordMapper.java | 36 +-- .../LmsSetupRecordDynamicSqlSupport.java | 32 +- .../batis/mapper/LmsSetupRecordMapper.java | 36 +-- .../OrientationRecordDynamicSqlSupport.java | 24 +- .../batis/mapper/OrientationRecordMapper.java | 36 +-- ...ProctoringRoomRecordDynamicSqlSupport.java | 22 +- .../RemoteProctoringRoomRecordMapper.java | 36 +-- .../mapper/RoleRecordDynamicSqlSupport.java | 10 +- .../batis/mapper/RoleRecordMapper.java | 36 +-- ...ebClientConfigRecordDynamicSqlSupport.java | 20 +- .../mapper/SebClientConfigRecordMapper.java | 36 +-- .../ThresholdRecordDynamicSqlSupport.java | 14 +- .../batis/mapper/ThresholdRecordMapper.java | 36 +-- ...serActivityLogRecordDynamicSqlSupport.java | 18 +- .../mapper/UserActivityLogRecordMapper.java | 36 +-- .../mapper/UserRecordDynamicSqlSupport.java | 28 +- .../batis/mapper/UserRecordMapper.java | 36 +-- .../mapper/ViewRecordDynamicSqlSupport.java | 14 +- .../batis/mapper/ViewRecordMapper.java | 36 +-- ...viceServerInfoRecordDynamicSqlSupport.java | 14 +- .../WebserviceServerInfoRecordMapper.java | 36 +-- .../model/AdditionalAttributeRecord.java | 28 +- .../batis/model/BatchActionRecord.java | 54 ++-- .../batis/model/CertificateRecord.java | 24 +- .../batis/model/ClientConnectionRecord.java | 76 ++--- .../batis/model/ClientEventRecord.java | 52 ++-- .../batis/model/ClientIndicatorRecord.java | 34 +-- .../batis/model/ClientInstructionRecord.java | 36 +-- .../batis/model/ClientNotificationRecord.java | 32 +- .../model/ConfigurationAttributeRecord.java | 40 +-- .../batis/model/ConfigurationNodeRecord.java | 40 +-- .../batis/model/ConfigurationRecord.java | 32 +- .../batis/model/ConfigurationValueRecord.java | 32 +- .../model/ExamConfigurationMapRecord.java | 32 +- .../datalayer/batis/model/ExamRecord.java | 72 ++--- .../batis/model/ExamTemplateRecord.java | 44 +-- .../batis/model/IndicatorRecord.java | 36 +-- .../batis/model/InstitutionRecord.java | 32 +- .../datalayer/batis/model/LmsSetupRecord.java | 64 ++-- .../batis/model/OrientationRecord.java | 48 +-- .../model/RemoteProctoringRoomRecord.java | 44 +-- .../datalayer/batis/model/RoleRecord.java | 20 +- .../batis/model/SebClientConfigRecord.java | 40 +-- .../batis/model/ThresholdRecord.java | 28 +- .../batis/model/UserActivityLogRecord.java | 36 +-- .../datalayer/batis/model/UserRecord.java | 56 ++-- .../datalayer/batis/model/ViewRecord.java | 28 +- .../model/WebserviceServerInfoRecord.java | 28 +- .../authorization/AuthorizationService.java | 43 ++- .../impl/AuthorizationServiceImpl.java | 13 + .../bulkaction/BatchActionExec.java | 5 +- .../bulkaction/BatchActionService.java | 22 +- .../impl/BatchActionServiceImpl.java | 152 ++++----- .../impl/ExamConfigStateChange.java | 46 ++- .../servicelayer/dao/BatchActionDAO.java | 18 +- .../dao/impl/BatchActionDAOImpl.java | 188 ++++++++---- .../weblayer/api/APIExceptionHandler.java | 11 + .../weblayer/api/BatchActionController.java | 84 +++++ .../api/ConfigurationNodeController.java | 32 +- .../config/sql/base/V15__alterTables_v1_4.sql | 1 + src/main/resources/messages.properties | 12 + .../integration/UseCasesIntegrationTest.java | 6 +- src/test/resources/schema-test.sql | 4 +- 118 files changed, 2416 insertions(+), 1583 deletions(-) create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigStateChangePopup.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/page/AbstractBatchActionWizard.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/batch/DoBatchAction.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/batch/GetBatchAction.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/BatchActionController.java diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java b/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java index aa529b4f..066619d9 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java @@ -232,4 +232,6 @@ public final class API { public static final String EXAM_TEMPLATE_INDICATOR_PATH_SEGMENT = "/indicator"; public static final String EXAM_TEMPLATE_DEFAULT_PATH_SEGMENT = "/default"; + public static final String BATCH_ACTION_ENDPOINT = "/batch-action"; + } diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java b/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java index 55a6984a..e1d060c9 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java @@ -2,7 +2,7 @@ package ch.ethz.seb.sebserver.gbl.api; import javax.annotation.Generated; -@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2022-04-04T10:34:44.224+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2022-04-06T16:51:30.864+02:00") public enum EntityType { CONFIGURATION_ATTRIBUTE, CONFIGURATION_VALUE, diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/api/POSTMapper.java b/src/main/java/ch/ethz/seb/sebserver/gbl/api/POSTMapper.java index 3fccdbab..145be78c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/api/POSTMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/api/POSTMapper.java @@ -14,7 +14,9 @@ import java.util.Base64; import java.util.Collections; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Set; +import java.util.function.Function; import java.util.stream.Collectors; import org.apache.commons.lang3.BooleanUtils; @@ -226,6 +228,14 @@ public class POSTMapper { return Utils.toDateTime(value); } + public Map getSubMap(final Set actionAttributes) { + return this.params + .keySet() + .stream() + .filter(actionAttributes::contains) + .collect(Collectors.toMap(Function.identity(), k -> this.params.getFirst(k))); + } + public List getThresholds() { final List thresholdStrings = this.params.get(Domain.THRESHOLD.REFERENCE_NAME); if (thresholdStrings == null || thresholdStrings.isEmpty()) { diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/BatchAction.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/BatchAction.java index cf3537dc..cae4ab76 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/BatchAction.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/BatchAction.java @@ -8,22 +8,37 @@ package ch.ethz.seb.sebserver.gbl.model; +import java.util.Arrays; import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; import java.util.Map; +import java.util.Set; import javax.validation.constraints.NotNull; +import org.apache.commons.lang3.StringUtils; + +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.api.API.BatchActionType; +import ch.ethz.seb.sebserver.gbl.api.APIMessage; import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.api.POSTMapper; import ch.ethz.seb.sebserver.gbl.model.Domain.BATCH_ACTION; import ch.ethz.seb.sebserver.gbl.util.Utils; -public class BatchAction implements Entity { +public class BatchAction implements GrantEntity { + public static final String ATTR_FAILURES = "failures"; + public static final String FINISHED_FLAG = "_FINISHED"; public static final String ACTION_ATTRIBUT_TARGET_STATE = "batchActionTargetState"; + private static final Set ACTION_ATTRIBUTES = new HashSet<>(Arrays.asList( + ACTION_ATTRIBUT_TARGET_STATE)); + @JsonProperty(BATCH_ACTION.ATTR_ID) public final Long id; @@ -31,6 +46,10 @@ public class BatchAction implements Entity { @JsonProperty(BATCH_ACTION.ATTR_INSTITUTION_ID) public final Long institutionId; + @NotNull + @JsonProperty(BATCH_ACTION.ATTR_OWNER) + public final String ownerId; + @NotNull @JsonProperty(BATCH_ACTION.ATTR_ACTION_TYPE) public final BatchActionType actionType; @@ -51,25 +70,49 @@ public class BatchAction implements Entity { @JsonProperty(BATCH_ACTION.ATTR_PROCESSOR_ID) public final String processorId; + @JsonProperty(ATTR_FAILURES) + public final Map failures; + public BatchAction( @JsonProperty(BATCH_ACTION.ATTR_ID) final Long id, @JsonProperty(BATCH_ACTION.ATTR_INSTITUTION_ID) final Long institutionId, + @JsonProperty(BATCH_ACTION.ATTR_OWNER) final String ownerId, @JsonProperty(BATCH_ACTION.ATTR_ACTION_TYPE) final BatchActionType actionType, @JsonProperty(BATCH_ACTION.ATTR_ATTRIBUTES) final Map attributes, @JsonProperty(BATCH_ACTION.ATTR_SOURCE_IDS) final Collection sourceIds, @JsonProperty(BATCH_ACTION.ATTR_SUCCESSFUL) final Collection successful, @JsonProperty(BATCH_ACTION.ATTR_LAST_UPDATE) final Long lastUpdate, - @JsonProperty(BATCH_ACTION.ATTR_PROCESSOR_ID) final String processorId) { + @JsonProperty(BATCH_ACTION.ATTR_PROCESSOR_ID) final String processorId, + @JsonProperty(ATTR_FAILURES) final Map failures) { super(); this.id = id; this.institutionId = institutionId; + this.ownerId = ownerId; this.actionType = actionType; this.attributes = Utils.immutableMapOf(attributes); this.sourceIds = Utils.immutableCollectionOf(sourceIds); this.successful = Utils.immutableCollectionOf(successful); this.lastUpdate = lastUpdate; this.processorId = processorId; + this.failures = Utils.immutableMapOf(failures); + } + + public BatchAction(final String modelId, final String ownerId, final POSTMapper postMap) { + + super(); + this.id = (modelId != null) ? Long.parseLong(modelId) : null; + this.institutionId = postMap.getLong(BATCH_ACTION.ATTR_INSTITUTION_ID); + this.ownerId = ownerId; + this.actionType = postMap.getEnum(BATCH_ACTION.ATTR_ACTION_TYPE, BatchActionType.class); + this.attributes = postMap.getSubMap(ACTION_ATTRIBUTES); + this.sourceIds = Utils.immutableListOf(StringUtils.split( + postMap.getString(BATCH_ACTION.ATTR_SOURCE_IDS), + Constants.LIST_SEPARATOR)); + this.successful = Collections.emptyList(); + this.lastUpdate = null; + this.processorId = null; + this.failures = Collections.emptyMap(); } @Override @@ -93,10 +136,16 @@ public class BatchAction implements Entity { return this.id; } + @Override public Long getInstitutionId() { return this.institutionId; } + @Override + public String getOwnerId() { + return this.ownerId; + } + public BatchActionType getActionType() { return this.actionType; } @@ -121,6 +170,20 @@ public class BatchAction implements Entity { return this.processorId; } + public Map getFailures() { + return this.failures; + } + + @JsonIgnore + public int getProgress() { + return 100 / this.sourceIds.size() * (this.successful.size() + this.failures.size()); + } + + @JsonIgnore + public boolean isFinished() { + return this.processorId != null && this.processorId.contains(FINISHED_FLAG); + } + @Override public int hashCode() { final int prime = 31; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java index 94302207..ed13a27f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java @@ -5,7 +5,7 @@ import javax.annotation.Generated; /** Defines the global names of the domain model and domain model fields. * This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within the integrated GUI * This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/ -@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2022-04-04T10:34:44.151+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2022-04-06T16:51:30.803+02:00") public interface Domain { interface CONFIGURATION_ATTRIBUTE { @@ -323,6 +323,7 @@ public interface Domain { String REFERENCE_NAME = "batchActions"; String ATTR_ID = "id"; String ATTR_INSTITUTION_ID = "institutionId"; + String ATTR_OWNER = "owner"; String ATTR_ACTION_TYPE = "actionType"; String ATTR_ATTRIBUTES = "attributes"; String ATTR_SOURCE_IDS = "sourceIds"; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityDependency.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityDependency.java index 1103a9d7..9125ed78 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityDependency.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityDependency.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) -public class EntityDependency implements Comparable { +public class EntityDependency implements Comparable, ModelIdAware { public static final String ATTR_PARENT = "parent"; public static final String ATTR_SELF = "self"; @@ -48,6 +48,11 @@ public class EntityDependency implements Comparable { return this.self; } + @Override + public String getModelId() { + return this.self.modelId; + } + public String getName() { return this.name; } diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java index 7e77cf33..e2aa8d8f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java @@ -255,11 +255,7 @@ public final class Result { * @return self reference */ public Result onError(final Consumer errorHandler) { if (this.error != null) { - try { - errorHandler.accept(this.error); - } catch (final Exception e) { - log.error("Unexpected failure on error handling: ", e); - } + errorHandler.accept(this.error); } return this; } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java index 36186c37..c6b1efa5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java @@ -527,6 +527,12 @@ public enum ActionDefinition { PageStateDefinitionImpl.SEB_EXAM_CONFIG_LIST, ActionCategory.LIST_VARIA), + SEB_EXAM_CONFIG_BULK_STATE_CHANGE( + new LocTextKey("sebserver.examconfig.list.action.statechange"), + ImageIcon.SWITCH, + PageStateDefinitionImpl.SEB_EXAM_CONFIG_LIST, + ActionCategory.SEB_EXAM_CONFIG_LIST), + SEB_EXAM_CONFIG_MODIFY_PROP_FROM_LIST( new LocTextKey("sebserver.examconfig.action.list.modify.properties"), ImageIcon.EDIT, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/CertificateImportPopup.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/CertificateImportPopup.java index b8d4f872..859544c3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/CertificateImportPopup.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/CertificateImportPopup.java @@ -227,10 +227,6 @@ public class CertificateImportPopup { null, CertificateFileType.getAllExtensions())) -// .addField(FormBuilder.text( -// CertificateInfo.ATTR_ALIAS, -// CertificateList.FORM_ALIAS_TEXT_KEY)) - .addField(FormBuilder.text( API.IMPORT_PASSWORD_ATTR_NAME, CertificateList.FORM_IMPORT_PASSWORD_TEXT_KEY, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigCreationPopup.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigCreationPopup.java index 78eebe6f..cc76b8dd 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigCreationPopup.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigCreationPopup.java @@ -71,13 +71,11 @@ public class SEBExamConfigCreationPopup { .setLargeDialogWidth(); final CreationFormContext formContext = new CreationFormContext( - this.pageService, pageContext, copyAsTemplate, createFromTemplate); final Predicate> doCopy = formHandle -> doCreate( - this.pageService, pageContext, copyAsTemplate, createFromTemplate, @@ -100,7 +98,6 @@ public class SEBExamConfigCreationPopup { } private boolean doCreate( - final PageService pageService, final PageContext pageContext, final boolean copyAsTemplate, final boolean createFromTemplate, @@ -111,7 +108,7 @@ public class SEBExamConfigCreationPopup { ? NewExamConfig.class : CopyConfiguration.class; - final ConfigurationNode newConfig = pageService + final ConfigurationNode newConfig = this.pageService .getRestService() .getBuilder(restCall) .withFormBinding(formHandle.getFormBinding()) @@ -125,34 +122,31 @@ public class SEBExamConfigCreationPopup { // view either new template or configuration final PageAction viewCopy = (copyAsTemplate) - ? pageService.pageActionBuilder(pageContext) + ? this.pageService.pageActionBuilder(pageContext) .newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_VIEW) .withEntityKey(new EntityKey(newConfig.id, EntityType.CONFIGURATION_NODE)) .create() - : pageService.pageActionBuilder(pageContext) + : this.pageService.pageActionBuilder(pageContext) .newAction(ActionDefinition.SEB_EXAM_CONFIG_VIEW_PROP) .withEntityKey(new EntityKey(newConfig.id, EntityType.CONFIGURATION_NODE)) .create(); - pageService.executePageAction(viewCopy); + this.pageService.executePageAction(viewCopy); return true; } private final class CreationFormContext implements ModalInputDialogComposer> { - private final PageService pageService; private final PageContext pageContext; private final boolean copyAsTemplate; private final boolean createFromTemplate; protected CreationFormContext( - final PageService pageService, final PageContext pageContext, final boolean copyAsTemplate, final boolean createFromTemplate) { - this.pageService = pageService; this.pageContext = pageContext; this.copyAsTemplate = copyAsTemplate; this.createFromTemplate = createFromTemplate; @@ -161,11 +155,11 @@ public class SEBExamConfigCreationPopup { @Override public Supplier> compose(final Composite parent) { - final Composite grid = this.pageService.getWidgetFactory() + final Composite grid = SEBExamConfigCreationPopup.this.pageService.getWidgetFactory() .createPopupScrollComposite(parent); final EntityKey entityKey = this.pageContext.getEntityKey(); - final FormHandle formHandle = this.pageService.formBuilder( + final FormHandle formHandle = SEBExamConfigCreationPopup.this.pageService.formBuilder( this.pageContext.copyOf(grid)) .readonly(false) .putStaticValueIf( diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigList.java index 96da9d56..4b7d0075 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigList.java @@ -70,6 +70,7 @@ public class SEBExamConfigList implements TemplateComposer { private final PageService pageService; private final SEBExamConfigImportPopup sebExamConfigImportPopup; private final SEBExamConfigCreationPopup sebExamConfigCreationPopup; + private final SEBExamConfigStateChangePopup sebExamConfigStateChangePopup; private final CurrentUser currentUser; private final ResourceService resourceService; private final int pageSize; @@ -78,11 +79,13 @@ public class SEBExamConfigList implements TemplateComposer { final PageService pageService, final SEBExamConfigImportPopup sebExamConfigImportPopup, final SEBExamConfigCreationPopup sebExamConfigCreationPopup, + final SEBExamConfigStateChangePopup sebExamConfigStateChangePopup, @Value("${sebserver.gui.list.page.size:20}") final Integer pageSize) { this.pageService = pageService; this.sebExamConfigImportPopup = sebExamConfigImportPopup; this.sebExamConfigCreationPopup = sebExamConfigCreationPopup; + this.sebExamConfigStateChangePopup = sebExamConfigStateChangePopup; this.currentUser = pageService.getCurrentUser(); this.resourceService = pageService.getResourceService(); this.pageSize = pageSize; @@ -112,6 +115,7 @@ public class SEBExamConfigList implements TemplateComposer { // exam configuration table final EntityTable configTable = this.pageService.entityTableBuilder(GetExamConfigNodePage.class) + .withMultiSelection() .withStaticFilter( Domain.CONFIGURATION_NODE.ATTR_TYPE, ConfigurationType.EXAM_CONFIG.name()) @@ -154,7 +158,8 @@ public class SEBExamConfigList implements TemplateComposer { pageContext, ActionDefinition.SEB_EXAM_CONFIG_VIEW_PROP_FROM_LIST, ActionDefinition.SEB_EXAM_CONFIG_MODIFY_PROP_FROM_LIST, - ActionDefinition.SEB_EXAM_CONFIG_COPY_CONFIG_FROM_LIST)) + ActionDefinition.SEB_EXAM_CONFIG_COPY_CONFIG_FROM_LIST, + ActionDefinition.SEB_EXAM_CONFIG_BULK_STATE_CHANGE)) .compose(pageContext.copyOf(content)); @@ -179,7 +184,6 @@ public class SEBExamConfigList implements TemplateComposer { .publishIf(() -> examConfigGrant.im(), false) .newAction(ActionDefinition.SEB_EXAM_CONFIG_COPY_CONFIG_FROM_LIST) - //.withEntityKey(entityKey) .withSelect( configTable.getGrantedSelection(this.currentUser, NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION), pageAction -> { @@ -199,6 +203,14 @@ public class SEBExamConfigList implements TemplateComposer { .noEventPropagation() .publishIf(() -> examConfigGrant.im(), false) + .newAction(ActionDefinition.SEB_EXAM_CONFIG_BULK_STATE_CHANGE) + .withSelect( + configTable.getGrantedSelection(this.currentUser, NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION), + this.sebExamConfigStateChangePopup.popupCreationFunction(pageContext), + EMPTY_SELECTION_TEXT_KEY) + .noEventPropagation() + .publishIf(() -> examConfigGrant.im(), false) + .newAction(ActionDefinition.SEB_EXAM_CONFIG_IMPORT_TO_NEW_CONFIG) .withSelect( configTable.getGrantedSelection(this.currentUser, NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION), diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigStateChangePopup.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigStateChangePopup.java new file mode 100644 index 00000000..30c74b07 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBExamConfigStateChangePopup.java @@ -0,0 +1,117 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gui.content.configs; + +import java.util.function.Supplier; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import ch.ethz.seb.sebserver.gbl.api.API.BatchActionType; +import ch.ethz.seb.sebserver.gbl.model.BatchAction; +import ch.ethz.seb.sebserver.gbl.model.Domain; +import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode; +import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationStatus; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.form.FormBuilder; +import ch.ethz.seb.sebserver.gui.form.FormHandle; +import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; +import ch.ethz.seb.sebserver.gui.service.page.AbstractBatchActionWizard; +import ch.ethz.seb.sebserver.gui.service.page.PageContext; +import ch.ethz.seb.sebserver.gui.service.page.PageService; +import ch.ethz.seb.sebserver.gui.service.push.ServerPushService; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class SEBExamConfigStateChangePopup extends AbstractBatchActionWizard { + + private static final String ATTR_SELECTED_TARGET_STATE = "selectedTargetState"; + + private final static LocTextKey FORM_TITLE = + new LocTextKey("sebserver.examconfig.list.batch.statechange.title"); + private final static LocTextKey ACTION_DO_STATE_CHANGE = + new LocTextKey("sebserver.examconfig.list.batch.action.statechange"); + private final static LocTextKey FORM_INFO = + new LocTextKey("sebserver.examconfig.list.batch.action.statechange.info"); + private final static LocTextKey FORM_STATUS_TEXT_KEY = + new LocTextKey("sebserver.examconfig.list.batch.action.status"); + + protected SEBExamConfigStateChangePopup( + final PageService pageService, + final ServerPushService serverPushService) { + + super(pageService, serverPushService); + } + + @Override + protected LocTextKey getTitle() { + return FORM_TITLE; + } + + @Override + protected LocTextKey getBatchActionInfo() { + return FORM_INFO; + } + + @Override + protected LocTextKey getBatchActionTitle() { + return ACTION_DO_STATE_CHANGE; + } + + @Override + protected BatchActionType getBatchActionType() { + return BatchActionType.EXAM_CONFIG_STATE_CHANGE; + } + + @Override + public FormBuilder buildSpecificFormFields( + final PageContext formContext, + final FormBuilder formHead, + final boolean readonly) { + + final String targetStateName = readonly + ? formContext.getAttribute(ATTR_SELECTED_TARGET_STATE) + : ConfigurationStatus.CONSTRUCTION.name(); + + return formHead.addField(FormBuilder.singleSelection( + Domain.CONFIGURATION_NODE.ATTR_STATUS, + FORM_STATUS_TEXT_KEY, + targetStateName, + () -> this.pageService.getResourceService() + .examConfigStatusResources(false)) + .readonly(readonly)); + } + + @Override + protected Supplier createResultPageSupplier( + final PageContext pageContext, + final FormHandle formHandle) { + + return () -> pageContext.withAttribute( + ATTR_SELECTED_TARGET_STATE, + formHandle.getForm().getFieldValue(Domain.CONFIGURATION_NODE.ATTR_STATUS)); + } + + @Override + protected void extendBatchActionRequest( + final PageContext pageContext, + final RestCall.RestCallBuilder batchActionRequestBuilder) { + + final String targetStateName = pageContext.getAttribute(ATTR_SELECTED_TARGET_STATE); + if (StringUtils.isBlank(targetStateName)) { + throw new IllegalArgumentException("missing " + ATTR_SELECTED_TARGET_STATE + " form pageContext"); + } + + batchActionRequestBuilder.withFormParam(BatchAction.ACTION_ATTRIBUT_TARGET_STATE, targetStateName); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringClientConnection.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringClientConnection.java index aceef164..a3b5eb4b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringClientConnection.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringClientConnection.java @@ -276,14 +276,11 @@ public class MonitoringClientConnection implements TemplateComposer { final Supplier> notificationTableSupplier = _notificationTableSupplier; // server push update - final UpdateErrorHandler updateErrorHandler = - new UpdateErrorHandler(this.pageService, pageContext); - this.serverPushService.runServerPush( new ServerPushContext( content, Utils.truePredicate(), - updateErrorHandler), + new UpdateErrorHandler(this.pageService, pageContext)), this.pollInterval, context -> clientConnectionDetails.updateData(), context -> clientConnectionDetails.updateGUI(notificationTableSupplier, pageContext)); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/AbstractBatchActionWizard.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/AbstractBatchActionWizard.java new file mode 100644 index 00000000..253e1875 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/AbstractBatchActionWizard.java @@ -0,0 +1,289 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gui.service.page; + +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; + +import org.apache.commons.lang3.StringUtils; +import org.eclipse.swt.widgets.Composite; + +import ch.ethz.seb.sebserver.gbl.Constants; +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.API.BatchActionType; +import ch.ethz.seb.sebserver.gbl.model.BatchAction; +import ch.ethz.seb.sebserver.gbl.model.Domain.BATCH_ACTION; +import ch.ethz.seb.sebserver.gbl.model.EntityKey; +import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode; +import ch.ethz.seb.sebserver.gbl.util.Utils; +import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition; +import ch.ethz.seb.sebserver.gui.form.Form; +import ch.ethz.seb.sebserver.gui.form.FormBuilder; +import ch.ethz.seb.sebserver.gui.form.FormHandle; +import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; +import ch.ethz.seb.sebserver.gui.service.page.impl.ModalInputWizard; +import ch.ethz.seb.sebserver.gui.service.page.impl.ModalInputWizard.WizardAction; +import ch.ethz.seb.sebserver.gui.service.page.impl.ModalInputWizard.WizardPage; +import ch.ethz.seb.sebserver.gui.service.page.impl.PageAction; +import ch.ethz.seb.sebserver.gui.service.push.ServerPushContext; +import ch.ethz.seb.sebserver.gui.service.push.ServerPushService; +import ch.ethz.seb.sebserver.gui.service.push.UpdateErrorHandler; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.batch.DoBatchAction; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.batch.GetBatchAction; + +public abstract class AbstractBatchActionWizard { + + protected final String BATCH_ACTION_PAGE_NAME = "BATCH_ACTION_PAGE"; + protected final String BATCH_ACTION_RESULT_PAGE_NAME = "BATCH_ACTION_RESULT_PAGE"; + protected static final String SELECTED_OBJECTS_NAME = "FORM_SELECTED_OBJECTS"; + protected static final String FORM_FAILURE_NAME = "FAILURE"; + protected static final String FORM_SUCCESS_NAME = "SUCCESS"; + protected static final String FORM_PROGRESS_NAME = "PROGRESS"; + + private final static LocTextKey FORM_SELECTED_OBJECTS = + new LocTextKey("sebserver.overall.batchaction.selected"); + + protected final PageService pageService; + protected final ServerPushService serverPushService; + + protected AbstractBatchActionWizard( + final PageService pageService, + final ServerPushService serverPushService) { + + this.pageService = pageService; + this.serverPushService = serverPushService; + } + + protected abstract LocTextKey getTitle(); + + protected abstract LocTextKey getBatchActionInfo(); + + protected abstract LocTextKey getBatchActionTitle(); + + protected abstract BatchActionType getBatchActionType(); + + protected abstract Supplier createResultPageSupplier( + final PageContext pageContext, + final FormHandle formHandle); + + protected abstract void extendBatchActionRequest( + PageContext pageContext, + RestCall.RestCallBuilder batchActionRequestBuilder); + + protected abstract FormBuilder buildSpecificFormFields( + final PageContext formContext, + final FormBuilder formHead, + final boolean readonly); + + public Function popupCreationFunction(final PageContext pageContext) { + + return action -> { + final Set multiSelection = action.getMultiSelection(); + if (multiSelection == null || multiSelection.isEmpty()) { + return action; + } + + final ModalInputWizard wizard = + new ModalInputWizard( + action.pageContext().getParent().getShell(), + this.pageService.getWidgetFactory()) + .setVeryLargeDialogWidth(); + + final WizardPage page1 = new WizardPage<>( + this.BATCH_ACTION_PAGE_NAME, + true, + (prefPageContext, content) -> composeFormPage(content, pageContext, multiSelection), + new WizardAction<>(getBatchActionTitle(), this.BATCH_ACTION_RESULT_PAGE_NAME)); + + final WizardPage page2 = new WizardPage<>( + this.BATCH_ACTION_RESULT_PAGE_NAME, + false, + (prefPageContext, content) -> composeResultPage(content, prefPageContext, multiSelection)); + + wizard.open(getTitle(), Utils.EMPTY_EXECUTION, page1, page2); + + return action; + }; + } + + public Supplier composeFormPage( + final Composite parent, + final PageContext pageContext, + final Set multiSelection) { + + final PageService pageService = this.pageService; + final PageContext formContext = pageContext.copyOf(parent); + + final LocTextKey info = getBatchActionInfo(); + if (info != null) { + pageService.getWidgetFactory().labelLocalized(parent, info, true); + } + + final FormHandle formHandle = getFormHeadBuilder( + pageService, + formContext, + multiSelection, + false) + .build(); + + return createResultPageSupplier(pageContext, formHandle); + } + + public Supplier composeResultPage( + final Composite parent, + final PageContext pageContext, + final Set multiSelection) { + + try { + + final String ids = StringUtils.join( + multiSelection.stream().map(key -> key.modelId).collect(Collectors.toList()), + Constants.LIST_SEPARATOR_CHAR); + + final RestCall.RestCallBuilder batchActionRequestBuilder = this.pageService + .getRestService() + .getBuilder(DoBatchAction.class) + .withFormParam(BATCH_ACTION.ATTR_ACTION_TYPE, getBatchActionType().name()) + .withFormParam(BATCH_ACTION.ATTR_SOURCE_IDS, ids); + + extendBatchActionRequest(pageContext, batchActionRequestBuilder); + + final BatchAction batchAction = batchActionRequestBuilder + .call() + .getOrThrow(); + + final ProgressUpdate progressUpdate = new ProgressUpdate(batchAction.getModelId()); + final PageContext formContext = pageContext.copyOf(parent); + + final LocTextKey info = getBatchActionInfo(); + if (info != null) { + this.pageService.getWidgetFactory().labelLocalized(parent, info, true); + } + + final FormHandle formHandle = getFormHeadBuilder( + this.pageService, + formContext, + multiSelection, + true) + .build(); + + this.serverPushService.runServerPush( + new ServerPushContext( + parent, + context -> !progressUpdate.isFinished(), + new UpdateErrorHandler( + this.pageService, + formContext)), + 1000, + context -> progressUpdate.update(), + context -> updateGUI(context, formContext, progressUpdate, formHandle.getForm())); + } catch (final Exception e) { + pageContext.notifyUnexpectedError(e); + throw e; + } + + return () -> pageContext; + } + + protected void updateGUI( + final ServerPushContext context, + final PageContext formContext, + final ProgressUpdate progressCall, + final Form form) { + + if (!progressCall.isFinished()) { + form.setFieldValue( + FORM_PROGRESS_NAME, + progressCall.batchAction.getProgress() + " %"); + } else { + form.setFieldValue( + FORM_PROGRESS_NAME, + "100 %"); + } + + form.setFieldValue( + FORM_SUCCESS_NAME, + String.valueOf(progressCall.batchAction.successful.size())); + form.setFieldValue( + FORM_FAILURE_NAME, + String.valueOf(progressCall.batchAction.failures.size())); + + formContext.getParent().layout(true, true); + + this.pageService.executePageAction(this.pageService.pageActionBuilder(formContext) + .newAction(ActionDefinition.SEB_EXAM_CONFIG_LIST) + .create()); + } + + protected FormBuilder getFormHeadBuilder( + final PageService pageService, + final PageContext formContext, + final Set multiSelection, + final boolean readonly) { + + final FormBuilder formBuilder = pageService + .formBuilder(formContext) + .addField(FormBuilder.text( + SELECTED_OBJECTS_NAME, + FORM_SELECTED_OBJECTS, + String.valueOf(multiSelection.size())) + .readonly(true)); + + buildSpecificFormFields(formContext, formBuilder, readonly); + return buildProgressFields(formBuilder, readonly); + } + + protected FormBuilder buildProgressFields(final FormBuilder formHead, final boolean readonly) { + return formHead + .addField(FormBuilder.text( + FORM_PROGRESS_NAME, + new LocTextKey("Progress"), + "0 %") + .readonly(true).visibleIf(!readonly)) + + .addField(FormBuilder.text( + FORM_SUCCESS_NAME, + new LocTextKey("Success"), + "0") + .asNumber() + .readonly(true).visibleIf(!readonly)) + + .addField(FormBuilder.text( + FORM_FAILURE_NAME, + new LocTextKey("Failures"), + "0") + .asNumber() + .readonly(true).visibleIf(!readonly)); + } + + private final class ProgressUpdate { + + final RestCall.RestCallBuilder progressCall; + private BatchAction batchAction = null; + + ProgressUpdate(final String modelId) { + this.progressCall = AbstractBatchActionWizard.this.pageService + .getRestService() + .getBuilder(GetBatchAction.class) + .withURIVariable(API.PARAM_MODEL_ID, modelId); + } + + void update() { + this.batchAction = this.progressCall.call().getOrThrow(); + } + + boolean isFinished() { + return this.batchAction != null && this.batchAction.isFinished(); + } + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java index 4cee4db2..28644841 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java @@ -35,6 +35,7 @@ import ch.ethz.seb.sebserver.gbl.api.JSONMapper; import ch.ethz.seb.sebserver.gbl.model.Activatable; import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.EntityKey; +import ch.ethz.seb.sebserver.gbl.model.ModelIdAware; import ch.ethz.seb.sebserver.gbl.model.Page; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Tuple; @@ -173,7 +174,7 @@ public interface PageService { * @return a message supplier to notify deactivation dependencies to the user */ default Supplier confirmDeactivation(final EntityTable table) { return () -> confirmDeactivation(table - .getSelectedROWData() + .getPageSelectionData() .stream() .filter(entity -> entity.isActive()) // NOTE: Activatable::isActive leads to an error here!? .collect(Collectors.toSet())) @@ -321,7 +322,7 @@ public interface PageService { * @param apiCall the SEB Server API RestCall that feeds the table with data * @param the type of the Entity of the table * @return TableBuilder of specified type */ - default TableBuilder entityTableBuilder(final RestCall> apiCall) { + default TableBuilder entityTableBuilder(final RestCall> apiCall) { return entityTableBuilder(apiCall.getClass().getSimpleName(), apiCall); } @@ -331,13 +332,14 @@ public interface PageService { * @param apiCall the SEB Server API RestCall that feeds the table with data * @param the type of the Entity of the table * @return TableBuilder of specified type */ - TableBuilder entityTableBuilder( + TableBuilder entityTableBuilder( String name, RestCall> apiCall); - TableBuilder staticListTableBuilder(final List staticList, EntityType entityType); + TableBuilder staticListTableBuilder(final List staticList, EntityType entityType); - TableBuilder remoteListTableBuilder(RestCall> apiCall, EntityType entityType); + TableBuilder remoteListTableBuilder(RestCall> apiCall, + EntityType entityType); /** Get a new PageActionBuilder for a given PageContext. * diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ModalInputWizard.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ModalInputWizard.java index b96b61f0..2645356f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ModalInputWizard.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ModalInputWizard.java @@ -171,7 +171,9 @@ public class ModalInputWizard extends Dialog { } } - final Button cancel = this.widgetFactory.buttonLocalized(actionsComp, ModalInputDialog.CANCEL_TEXT_KEY); + final Button cancel = this.widgetFactory.buttonLocalized( + actionsComp, + (page.actions.isEmpty()) ? ModalInputDialog.OK_TEXT_KEY : ModalInputDialog.CANCEL_TEXT_KEY); final RowData data = new RowData(); data.width = this.buttonWidth; cancel.setLayoutData(data); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java index 1d87f60e..3164a40e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java @@ -35,6 +35,7 @@ import ch.ethz.seb.sebserver.gbl.api.JSONMapper; import ch.ethz.seb.sebserver.gbl.model.Activatable; import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.EntityKey; +import ch.ethz.seb.sebserver.gbl.model.ModelIdAware; import ch.ethz.seb.sebserver.gbl.model.Page; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; import ch.ethz.seb.sebserver.gbl.util.Cryptor; @@ -264,7 +265,7 @@ public class PageServiceImpl implements PageService { final Function testBeforeActivation) { return action -> { - final Set selectedROWData = table.getSelectedROWData(); + final Set selectedROWData = table.getPageSelectionData(); if (selectedROWData == null || selectedROWData.isEmpty()) { throw new PageMessageException(noSelectionText); } @@ -365,7 +366,7 @@ public class PageServiceImpl implements PageService { } @Override - public TableBuilder entityTableBuilder( + public TableBuilder entityTableBuilder( final String name, final RestCall> apiCall) { @@ -373,7 +374,7 @@ public class PageServiceImpl implements PageService { } @Override - public TableBuilder staticListTableBuilder( + public TableBuilder staticListTableBuilder( final List staticList, final EntityType entityType) { @@ -385,7 +386,7 @@ public class PageServiceImpl implements PageService { } @Override - public TableBuilder remoteListTableBuilder( + public TableBuilder remoteListTableBuilder( final RestCall> apiCall, final EntityType entityType) { diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/batch/DoBatchAction.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/batch/DoBatchAction.java new file mode 100644 index 00000000..860db1f8 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/batch/DoBatchAction.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.batch; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.BatchAction; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class DoBatchAction extends RestCall { + + public DoBatchAction() { + super(new TypeKey<>( + CallType.NEW, + EntityType.BATCH_ACTION, + new TypeReference() { + }), + HttpMethod.POST, + MediaType.APPLICATION_FORM_URLENCODED, + API.BATCH_ACTION_ENDPOINT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/batch/GetBatchAction.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/batch/GetBatchAction.java new file mode 100644 index 00000000..b06e895e --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/batch/GetBatchAction.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.batch; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.BatchAction; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class GetBatchAction extends RestCall { + + public GetBatchAction() { + super(new TypeKey<>( + CallType.GET_SINGLE, + EntityType.BATCH_ACTION, + new TypeReference() { + }), + HttpMethod.GET, + MediaType.APPLICATION_FORM_URLENCODED, + API.BATCH_ACTION_ENDPOINT + + API.MODEL_ID_VAR_PATH_SEGMENT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java b/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java index 0d0fcb3b..004a05d4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java @@ -12,6 +12,7 @@ import static ch.ethz.seb.sebserver.gui.service.i18n.PolyglotPageService.POLYGLO import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -24,8 +25,6 @@ import java.util.stream.Collectors; import org.eclipse.rap.rwt.RWT; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -46,6 +45,7 @@ import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.GrantEntity; +import ch.ethz.seb.sebserver.gbl.model.ModelIdAware; import ch.ethz.seb.sebserver.gbl.model.Page; import ch.ethz.seb.sebserver.gbl.model.PageSortOrder; import ch.ethz.seb.sebserver.gbl.util.Utils; @@ -60,7 +60,7 @@ import ch.ethz.seb.sebserver.gui.widget.WidgetFactory; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.ImageIcon; import io.micrometer.core.instrument.util.StringUtils; -public class EntityTable { +public class EntityTable { private static final Logger log = LoggerFactory.getLogger(EntityTable.class); @@ -92,11 +92,14 @@ public class EntityTable { private final TableFilter filter; private final Table table; private final TableNavigator navigator; + private final MultiValueMap staticQueryParams; private final BiConsumer rowDecorator; private final Consumer> selectionListener; private final Consumer contentChangeListener; + private final Set multiselection; + private final String defaultSortColumn; private final PageSortOrder defaultSortOrder; @@ -187,6 +190,8 @@ public class EntityTable { this.table.setData(RWT.MARKUP_ENABLED, Boolean.TRUE); } + this.multiselection = ((type & SWT.MULTI) > 0) ? new HashSet<>() : null; + if (defaultActionFunction != null) { final PageAction defaultAction = defaultActionFunction.apply(this); if (defaultAction != null) { @@ -204,23 +209,10 @@ public class EntityTable { }); } } - this.table.addListener(SWT.MouseDown, event -> { - if (event.button == Constants.RWT_MOUSE_BUTTON_1) { - return; - } - final Rectangle bounds = event.getBounds(); - final Point point = new Point(bounds.x, bounds.y); - final TableItem item = this.table.getItem(point); - if (item == null) { - return; - } - - for (int i = 0; i < columns.size(); i++) { - final Rectangle itemBounds = item.getBounds(i); - if (itemBounds.contains(point)) { - handleCellSelection(item, i); - return; - } + this.table.addListener(SWT.Selection, event -> { + if (this.multiselection != null && event.item != null) { + handleMultiSelection((TableItem) event.item); + event.doit = false; } }); @@ -368,7 +360,18 @@ public class EntityTable { return null; } - return getRowDataId(selection[0]); + return getEntityKey(selection[0]); + } + + public List getMultiSelection() { + if (this.multiselection == null) { + return Collections.emptyList(); + } + + return this.multiselection + .stream() + .map(modelId -> new EntityKey(modelId, getEntityType())) + .collect(Collectors.toList()); } public ROW getFirstRowData() { @@ -393,7 +396,8 @@ public class EntityTable { return getRowData(selection[0]); } - public Set getSelectedROWData() { + @Deprecated + public Set getPageSelectionData() { final TableItem[] selection = this.table.getSelection(); if (selection == null || selection.length == 0) { return Collections.emptySet(); @@ -416,7 +420,7 @@ public class EntityTable { return Arrays.stream(selection) .filter(item -> grantCheck == null || grantCheck.test(getRowData(item))) - .map(this::getRowDataId) + .map(this::getEntityKey) .collect(Collectors.toSet()); } @@ -609,7 +613,7 @@ public class EntityTable { return (ROW) item.getData(TABLE_ROW_DATA); } - private EntityKey getRowDataId(final TableItem item) { + private EntityKey getEntityKey(final TableItem item) { final ROW rowData = getRowData(item); if (rowData instanceof Entity) { return ((Entity) rowData).getEntityKey(); @@ -617,6 +621,11 @@ public class EntityTable { return null; } + private String getModelId(final TableItem item) { + final ROW rowData = getRowData(item); + return (rowData != null) ? rowData.getModelId() : null; + } + private void updateValues(final EntityTable table) { final TableItem[] items = table.table.getItems(); final TableColumn[] columns = table.table.getColumns(); @@ -672,16 +681,12 @@ public class EntityTable { } } - private void handleCellSelection(final TableItem item, final int index) { - // TODO handle selection tool-tips on cell level - } - private void notifySelectionChange() { if (this.selectionListener == null) { return; } - this.selectionListener.accept(this.getSelectedROWData()); + this.selectionListener.accept(this.getPageSelectionData()); } private void updateCurrentPageAttr() { @@ -789,11 +794,43 @@ public class EntityTable { } private void notifyContentChange() { + multiselectFromPage(); + if (this.contentChangeListener != null) { this.contentChangeListener.accept(this.table.getItemCount()); } } + private void handleMultiSelection(final TableItem item) { + if (this.multiselection != null) { + final String modelId = getModelId(item); + if (this.multiselection.contains(modelId)) { + this.multiselection.remove(modelId); + } else { + this.multiselection.add(modelId); + } + multiselectFromPage(); + } + } + + private void multiselectFromPage() { + if (this.multiselection != null) { + Arrays.asList(this.table.getItems()) + .stream() + .forEach(item -> { + final int index = this.table.indexOf(item); + if (this.multiselection.contains(getModelId(item))) { + if (!this.table.isSelected(index)) { + this.table.select(index); + } + } else { + this.table.deselect(index); + } + }); + notifySelectionChange(); + } + } + public void refreshPageSize() { if (this.pageSupplier.newBuilder() .withPaging(this.pageNumber, this.pageSize) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/table/TableBuilder.java b/src/main/java/ch/ethz/seb/sebserver/gui/table/TableBuilder.java index 6275ad97..b15897ff 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/table/TableBuilder.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/table/TableBuilder.java @@ -23,6 +23,7 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.ModelIdAware; import ch.ethz.seb.sebserver.gbl.model.Page; import ch.ethz.seb.sebserver.gbl.model.PageSortOrder; import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; @@ -31,7 +32,7 @@ import ch.ethz.seb.sebserver.gui.service.page.PageService; import ch.ethz.seb.sebserver.gui.service.page.impl.PageAction; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; -public class TableBuilder { +public class TableBuilder { private final String name; private final PageService pageService; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/table/TableFilter.java b/src/main/java/ch/ethz/seb/sebserver/gui/table/TableFilter.java index 78221463..7d51dc1c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/table/TableFilter.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/table/TableFilter.java @@ -32,6 +32,7 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import ch.ethz.seb.sebserver.gbl.Constants; +import ch.ethz.seb.sebserver.gbl.model.ModelIdAware; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.util.Tuple; import ch.ethz.seb.sebserver.gbl.util.Utils; @@ -41,7 +42,7 @@ import ch.ethz.seb.sebserver.gui.widget.Selection; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.ImageIcon; -public class TableFilter { +public class TableFilter { private static final Logger log = LoggerFactory.getLogger(TableFilter.class); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java index 8fa023a6..0dccdcd5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java @@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class AdditionalAttributeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source Table: additional_attributes") public static final AdditionalAttributeRecord additionalAttributeRecord = new AdditionalAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source field: additional_attributes.id") public static final SqlColumn id = additionalAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source field: additional_attributes.entity_type") public static final SqlColumn entityType = additionalAttributeRecord.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source field: additional_attributes.entity_id") public static final SqlColumn entityId = additionalAttributeRecord.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source field: additional_attributes.name") public static final SqlColumn name = additionalAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source field: additional_attributes.value") public static final SqlColumn value = additionalAttributeRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source Table: additional_attributes") public static final class AdditionalAttributeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java index 2e9ae849..24002de3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface AdditionalAttributeRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface AdditionalAttributeRecordMapper { }) AdditionalAttributeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface AdditionalAttributeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface AdditionalAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") default int insert(AdditionalAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(additionalAttributeRecord) @@ -102,7 +102,7 @@ public interface AdditionalAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") default int insertSelective(AdditionalAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(additionalAttributeRecord) @@ -114,19 +114,19 @@ public interface AdditionalAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, entityType, entityId, name, value) .from(additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, entityType, entityId, name, value) .from(additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") default AdditionalAttributeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, entityType, entityId, name, value) .from(additionalAttributeRecord) @@ -135,7 +135,7 @@ public interface AdditionalAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") default UpdateDSL> updateByExample(AdditionalAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalTo(record::getEntityType) @@ -144,7 +144,7 @@ public interface AdditionalAttributeRecordMapper { .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.064+02:00", comments="Source Table: additional_attributes") default UpdateDSL> updateByExampleSelective(AdditionalAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalToWhenPresent(record::getEntityType) @@ -153,7 +153,7 @@ public interface AdditionalAttributeRecordMapper { .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.065+02:00", comments="Source Table: additional_attributes") default int updateByPrimaryKey(AdditionalAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalTo(record::getEntityType) @@ -165,7 +165,7 @@ public interface AdditionalAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.464+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.065+02:00", comments="Source Table: additional_attributes") default int updateByPrimaryKeySelective(AdditionalAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalToWhenPresent(record::getEntityType) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordDynamicSqlSupport.java index 2764a5f0..94d7e41b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordDynamicSqlSupport.java @@ -6,39 +6,44 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class BatchActionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source Table: batch_action") public static final BatchActionRecord batchActionRecord = new BatchActionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source field: batch_action.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source field: batch_action.id") public static final SqlColumn id = batchActionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source field: batch_action.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source field: batch_action.institution_id") public static final SqlColumn institutionId = batchActionRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source field: batch_action.action_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source field: batch_action.owner") + public static final SqlColumn owner = batchActionRecord.owner; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source field: batch_action.action_type") public static final SqlColumn actionType = batchActionRecord.actionType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source field: batch_action.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source field: batch_action.attributes") public static final SqlColumn attributes = batchActionRecord.attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source field: batch_action.source_ids") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source field: batch_action.source_ids") public static final SqlColumn sourceIds = batchActionRecord.sourceIds; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source field: batch_action.successful") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source field: batch_action.successful") public static final SqlColumn successful = batchActionRecord.successful; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source field: batch_action.last_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source field: batch_action.last_update") public static final SqlColumn lastUpdate = batchActionRecord.lastUpdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source field: batch_action.processor_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source field: batch_action.processor_id") public static final SqlColumn processorId = batchActionRecord.processorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source Table: batch_action") public static final class BatchActionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); public final SqlColumn institutionId = column("institution_id", JDBCType.BIGINT); + public final SqlColumn owner = column("owner", JDBCType.VARCHAR); + public final SqlColumn actionType = column("action_type", JDBCType.VARCHAR); public final SqlColumn attributes = column("attributes", JDBCType.VARCHAR); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordMapper.java index 2e16e079..3339426d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/BatchActionRecordMapper.java @@ -32,24 +32,25 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface BatchActionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source Table: batch_action") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source Table: batch_action") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source Table: batch_action") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.076+02:00", comments="Source Table: batch_action") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), + @Arg(column="owner", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="action_type", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="attributes", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="source_ids", javaType=String.class, jdbcType=JdbcType.VARCHAR), @@ -59,11 +60,12 @@ public interface BatchActionRecordMapper { }) BatchActionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), + @Arg(column="owner", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="action_type", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="attributes", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="source_ids", javaType=String.class, jdbcType=JdbcType.VARCHAR), @@ -73,22 +75,22 @@ public interface BatchActionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(batchActionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, batchActionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, batchActionRecord) .where(id, isEqualTo(id_)) @@ -96,11 +98,12 @@ public interface BatchActionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default int insert(BatchActionRecord record) { return insert(SqlBuilder.insert(record) .into(batchActionRecord) .map(institutionId).toProperty("institutionId") + .map(owner).toProperty("owner") .map(actionType).toProperty("actionType") .map(attributes).toProperty("attributes") .map(sourceIds).toProperty("sourceIds") @@ -111,11 +114,12 @@ public interface BatchActionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default int insertSelective(BatchActionRecord record) { return insert(SqlBuilder.insert(record) .into(batchActionRecord) .map(institutionId).toPropertyWhenPresent("institutionId", record::getInstitutionId) + .map(owner).toPropertyWhenPresent("owner", record::getOwner) .map(actionType).toPropertyWhenPresent("actionType", record::getActionType) .map(attributes).toPropertyWhenPresent("attributes", record::getAttributes) .map(sourceIds).toPropertyWhenPresent("sourceIds", record::getSourceIds) @@ -126,31 +130,32 @@ public interface BatchActionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default QueryExpressionDSL>> selectByExample() { - return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, actionType, attributes, sourceIds, successful, lastUpdate, processorId) + return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, owner, actionType, attributes, sourceIds, successful, lastUpdate, processorId) .from(batchActionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default QueryExpressionDSL>> selectDistinctByExample() { - return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, actionType, attributes, sourceIds, successful, lastUpdate, processorId) + return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, owner, actionType, attributes, sourceIds, successful, lastUpdate, processorId) .from(batchActionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default BatchActionRecord selectByPrimaryKey(Long id_) { - return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, actionType, attributes, sourceIds, successful, lastUpdate, processorId) + return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, actionType, attributes, sourceIds, successful, lastUpdate, processorId) .from(batchActionRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default UpdateDSL> updateByExample(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalTo(record::getInstitutionId) + .set(owner).equalTo(record::getOwner) .set(actionType).equalTo(record::getActionType) .set(attributes).equalTo(record::getAttributes) .set(sourceIds).equalTo(record::getSourceIds) @@ -159,10 +164,11 @@ public interface BatchActionRecordMapper { .set(processorId).equalTo(record::getProcessorId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default UpdateDSL> updateByExampleSelective(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) + .set(owner).equalToWhenPresent(record::getOwner) .set(actionType).equalToWhenPresent(record::getActionType) .set(attributes).equalToWhenPresent(record::getAttributes) .set(sourceIds).equalToWhenPresent(record::getSourceIds) @@ -171,10 +177,11 @@ public interface BatchActionRecordMapper { .set(processorId).equalToWhenPresent(record::getProcessorId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default int updateByPrimaryKey(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalTo(record::getInstitutionId) + .set(owner).equalTo(record::getOwner) .set(actionType).equalTo(record::getActionType) .set(attributes).equalTo(record::getAttributes) .set(sourceIds).equalTo(record::getSourceIds) @@ -186,10 +193,11 @@ public interface BatchActionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.475+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.077+02:00", comments="Source Table: batch_action") default int updateByPrimaryKeySelective(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) + .set(owner).equalToWhenPresent(record::getOwner) .set(actionType).equalToWhenPresent(record::getActionType) .set(attributes).equalToWhenPresent(record::getAttributes) .set(sourceIds).equalToWhenPresent(record::getSourceIds) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordDynamicSqlSupport.java index 0c77806c..bae9e4ef 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordDynamicSqlSupport.java @@ -6,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class CertificateRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.070+02:00", comments="Source Table: certificate") public static final CertificateRecord certificateRecord = new CertificateRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source field: certificate.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.070+02:00", comments="Source field: certificate.id") public static final SqlColumn id = certificateRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source field: certificate.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.070+02:00", comments="Source field: certificate.institution_id") public static final SqlColumn institutionId = certificateRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source field: certificate.aliases") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.070+02:00", comments="Source field: certificate.aliases") public static final SqlColumn aliases = certificateRecord.aliases; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source field: certificate.cert_store") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.070+02:00", comments="Source field: certificate.cert_store") public static final SqlColumn certStore = certificateRecord.certStore; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.070+02:00", comments="Source Table: certificate") public static final class CertificateRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordMapper.java index 8939e44c..bd2abe14 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/CertificateRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface CertificateRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.070+02:00", comments="Source Table: certificate") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -55,7 +55,7 @@ public interface CertificateRecordMapper { }) CertificateRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,22 +65,22 @@ public interface CertificateRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(certificateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, certificateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, certificateRecord) .where(id, isEqualTo(id_)) @@ -88,7 +88,7 @@ public interface CertificateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default int insert(CertificateRecord record) { return insert(SqlBuilder.insert(record) .into(certificateRecord) @@ -99,7 +99,7 @@ public interface CertificateRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default int insertSelective(CertificateRecord record) { return insert(SqlBuilder.insert(record) .into(certificateRecord) @@ -110,19 +110,19 @@ public interface CertificateRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, aliases, certStore) .from(certificateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, aliases, certStore) .from(certificateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default CertificateRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, aliases, certStore) .from(certificateRecord) @@ -131,7 +131,7 @@ public interface CertificateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default UpdateDSL> updateByExample(CertificateRecord record) { return UpdateDSL.updateWithMapper(this::update, certificateRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -139,7 +139,7 @@ public interface CertificateRecordMapper { .set(certStore).equalTo(record::getCertStore); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default UpdateDSL> updateByExampleSelective(CertificateRecord record) { return UpdateDSL.updateWithMapper(this::update, certificateRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -147,7 +147,7 @@ public interface CertificateRecordMapper { .set(certStore).equalToWhenPresent(record::getCertStore); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default int updateByPrimaryKey(CertificateRecord record) { return UpdateDSL.updateWithMapper(this::update, certificateRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -158,7 +158,7 @@ public interface CertificateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.470+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.071+02:00", comments="Source Table: certificate") default int updateByPrimaryKeySelective(CertificateRecord record) { return UpdateDSL.updateWithMapper(this::update, certificateRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java index b5aaeebc..a44c6466 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java @@ -6,61 +6,61 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientConnectionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.407+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.996+02:00", comments="Source Table: client_connection") public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.407+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.996+02:00", comments="Source field: client_connection.id") public static final SqlColumn id = clientConnectionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.407+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.996+02:00", comments="Source field: client_connection.institution_id") public static final SqlColumn institutionId = clientConnectionRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.407+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.996+02:00", comments="Source field: client_connection.exam_id") public static final SqlColumn examId = clientConnectionRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.407+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.997+02:00", comments="Source field: client_connection.status") public static final SqlColumn status = clientConnectionRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.407+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.997+02:00", comments="Source field: client_connection.connection_token") public static final SqlColumn connectionToken = clientConnectionRecord.connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.407+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.997+02:00", comments="Source field: client_connection.exam_user_session_id") public static final SqlColumn examUserSessionId = clientConnectionRecord.examUserSessionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.407+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.997+02:00", comments="Source field: client_connection.client_address") public static final SqlColumn clientAddress = clientConnectionRecord.clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.407+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.997+02:00", comments="Source field: client_connection.virtual_client_address") public static final SqlColumn virtualClientAddress = clientConnectionRecord.virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.408+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.997+02:00", comments="Source field: client_connection.vdi") public static final SqlColumn vdi = clientConnectionRecord.vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.408+02:00", comments="Source field: client_connection.vdi_pair_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.997+02:00", comments="Source field: client_connection.vdi_pair_token") public static final SqlColumn vdiPairToken = clientConnectionRecord.vdiPairToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.408+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.997+02:00", comments="Source field: client_connection.creation_time") public static final SqlColumn creationTime = clientConnectionRecord.creationTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.408+02:00", comments="Source field: client_connection.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.998+02:00", comments="Source field: client_connection.update_time") public static final SqlColumn updateTime = clientConnectionRecord.updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.408+02:00", comments="Source field: client_connection.remote_proctoring_room_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.999+02:00", comments="Source field: client_connection.remote_proctoring_room_id") public static final SqlColumn remoteProctoringRoomId = clientConnectionRecord.remoteProctoringRoomId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.408+02:00", comments="Source field: client_connection.remote_proctoring_room_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.999+02:00", comments="Source field: client_connection.remote_proctoring_room_update") public static final SqlColumn remoteProctoringRoomUpdate = clientConnectionRecord.remoteProctoringRoomUpdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.409+02:00", comments="Source field: client_connection.client_machine_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.999+02:00", comments="Source field: client_connection.client_machine_name") public static final SqlColumn clientMachineName = clientConnectionRecord.clientMachineName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.409+02:00", comments="Source field: client_connection.client_os_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.999+02:00", comments="Source field: client_connection.client_os_name") public static final SqlColumn clientOsName = clientConnectionRecord.clientOsName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.409+02:00", comments="Source field: client_connection.client_version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.999+02:00", comments="Source field: client_connection.client_version") public static final SqlColumn clientVersion = clientConnectionRecord.clientVersion; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.407+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.996+02:00", comments="Source Table: client_connection") public static final class ClientConnectionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java index f9d1bb24..b3c2e3d6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientConnectionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.409+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.999+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.409+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.999+02:00", comments="Source Table: client_connection") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.409+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.999+02:00", comments="Source Table: client_connection") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.409+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.999+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -68,7 +68,7 @@ public interface ClientConnectionRecordMapper { }) ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.409+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -91,22 +91,22 @@ public interface ClientConnectionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.409+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31+02:00", comments="Source Table: client_connection") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.409+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31+02:00", comments="Source Table: client_connection") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.410+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31+02:00", comments="Source Table: client_connection") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.410+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31+02:00", comments="Source Table: client_connection") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord) .where(id, isEqualTo(id_)) @@ -114,7 +114,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.410+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31+02:00", comments="Source Table: client_connection") default int insert(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -138,7 +138,7 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.410+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31+02:00", comments="Source Table: client_connection") default int insertSelective(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -162,19 +162,19 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.410+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31+02:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, vdi, vdiPairToken, creationTime, updateTime, remoteProctoringRoomId, remoteProctoringRoomUpdate, clientMachineName, clientOsName, clientVersion) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.410+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.001+02:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, vdi, vdiPairToken, creationTime, updateTime, remoteProctoringRoomId, remoteProctoringRoomUpdate, clientMachineName, clientOsName, clientVersion) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.410+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.001+02:00", comments="Source Table: client_connection") default ClientConnectionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, vdi, vdiPairToken, creationTime, updateTime, remoteProctoringRoomId, remoteProctoringRoomUpdate, clientMachineName, clientOsName, clientVersion) .from(clientConnectionRecord) @@ -183,7 +183,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.410+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.001+02:00", comments="Source Table: client_connection") default UpdateDSL> updateByExample(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -204,7 +204,7 @@ public interface ClientConnectionRecordMapper { .set(clientVersion).equalTo(record::getClientVersion); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.410+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.001+02:00", comments="Source Table: client_connection") default UpdateDSL> updateByExampleSelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -225,7 +225,7 @@ public interface ClientConnectionRecordMapper { .set(clientVersion).equalToWhenPresent(record::getClientVersion); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.410+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.001+02:00", comments="Source Table: client_connection") default int updateByPrimaryKey(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -249,7 +249,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.411+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.001+02:00", comments="Source Table: client_connection") default int updateByPrimaryKeySelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java index 7506b64b..d8daa015 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java @@ -7,31 +7,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientEventRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.420+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.011+02:00", comments="Source Table: client_event") public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.420+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.011+02:00", comments="Source field: client_event.id") public static final SqlColumn id = clientEventRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.420+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.011+02:00", comments="Source field: client_event.client_connection_id") public static final SqlColumn clientConnectionId = clientEventRecord.clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.420+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.011+02:00", comments="Source field: client_event.type") public static final SqlColumn type = clientEventRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.420+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.011+02:00", comments="Source field: client_event.client_time") public static final SqlColumn clientTime = clientEventRecord.clientTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.420+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.011+02:00", comments="Source field: client_event.server_time") public static final SqlColumn serverTime = clientEventRecord.serverTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.011+02:00", comments="Source field: client_event.numeric_value") public static final SqlColumn numericValue = clientEventRecord.numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source field: client_event.text") public static final SqlColumn text = clientEventRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.420+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.011+02:00", comments="Source Table: client_event") public static final class ClientEventRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java index b223befe..ba0de454 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java @@ -32,19 +32,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientEventRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") @InsertProvider(type=SqlProviderAdapter.class, method="insert") int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ClientEventRecordMapper { }) ClientEventRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -70,22 +70,22 @@ public interface ClientEventRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.421+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord) .where(id, isEqualTo(id_)) @@ -93,7 +93,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.422+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default int insert(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -108,7 +108,7 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.422+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default int insertSelective(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -123,19 +123,19 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.422+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, clientConnectionId, type, clientTime, serverTime, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.422+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, clientConnectionId, type, clientTime, serverTime, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.422+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default ClientEventRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, clientConnectionId, type, clientTime, serverTime, numericValue, text) .from(clientEventRecord) @@ -144,7 +144,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.422+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default UpdateDSL> updateByExample(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(id).equalTo(record::getId) @@ -156,7 +156,7 @@ public interface ClientEventRecordMapper { .set(text).equalTo(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.422+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default UpdateDSL> updateByExampleSelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(id).equalToWhenPresent(record::getId) @@ -168,7 +168,7 @@ public interface ClientEventRecordMapper { .set(text).equalToWhenPresent(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.422+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.012+02:00", comments="Source Table: client_event") default int updateByPrimaryKey(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(clientConnectionId).equalTo(record::getClientConnectionId) @@ -182,7 +182,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.422+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.013+02:00", comments="Source Table: client_event") default int updateByPrimaryKeySelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordDynamicSqlSupport.java index e11b5fad..342ab878 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordDynamicSqlSupport.java @@ -6,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientIndicatorRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source Table: client_indicator") public static final ClientIndicatorRecord clientIndicatorRecord = new ClientIndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source field: client_indicator.id") public static final SqlColumn id = clientIndicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source field: client_indicator.client_connection_id") public static final SqlColumn clientConnectionId = clientIndicatorRecord.clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source field: client_indicator.type") public static final SqlColumn type = clientIndicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source field: client_indicator.value") public static final SqlColumn value = clientIndicatorRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source Table: client_indicator") public static final class ClientIndicatorRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordMapper.java index 2b1f3c41..b16a5920 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientIndicatorRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientIndicatorRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source Table: client_indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source Table: client_indicator") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source Table: client_indicator") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source Table: client_indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -55,7 +55,7 @@ public interface ClientIndicatorRecordMapper { }) ClientIndicatorRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source Table: client_indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,22 +65,22 @@ public interface ClientIndicatorRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.080+02:00", comments="Source Table: client_indicator") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.080+02:00", comments="Source Table: client_indicator") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientIndicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.080+02:00", comments="Source Table: client_indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientIndicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.080+02:00", comments="Source Table: client_indicator") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientIndicatorRecord) .where(id, isEqualTo(id_)) @@ -88,7 +88,7 @@ public interface ClientIndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.080+02:00", comments="Source Table: client_indicator") default int insert(ClientIndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(clientIndicatorRecord) @@ -99,7 +99,7 @@ public interface ClientIndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.080+02:00", comments="Source Table: client_indicator") default int insertSelective(ClientIndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(clientIndicatorRecord) @@ -110,19 +110,19 @@ public interface ClientIndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.478+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.080+02:00", comments="Source Table: client_indicator") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, clientConnectionId, type, value) .from(clientIndicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.478+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.080+02:00", comments="Source Table: client_indicator") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, clientConnectionId, type, value) .from(clientIndicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.478+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.080+02:00", comments="Source Table: client_indicator") default ClientIndicatorRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, clientConnectionId, type, value) .from(clientIndicatorRecord) @@ -131,7 +131,7 @@ public interface ClientIndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.478+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.081+02:00", comments="Source Table: client_indicator") default UpdateDSL> updateByExample(ClientIndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, clientIndicatorRecord) .set(clientConnectionId).equalTo(record::getClientConnectionId) @@ -139,7 +139,7 @@ public interface ClientIndicatorRecordMapper { .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.478+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.081+02:00", comments="Source Table: client_indicator") default UpdateDSL> updateByExampleSelective(ClientIndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, clientIndicatorRecord) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) @@ -147,7 +147,7 @@ public interface ClientIndicatorRecordMapper { .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.478+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.081+02:00", comments="Source Table: client_indicator") default int updateByPrimaryKey(ClientIndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, clientIndicatorRecord) .set(clientConnectionId).equalTo(record::getClientConnectionId) @@ -158,7 +158,7 @@ public interface ClientIndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.478+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source Table: client_indicator") default int updateByPrimaryKeySelective(ClientIndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, clientIndicatorRecord) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java index 6cc80e92..3b6f6185 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java @@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientInstructionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.424+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.016+02:00", comments="Source Table: client_instruction") public static final ClientInstructionRecord clientInstructionRecord = new ClientInstructionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.424+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.016+02:00", comments="Source field: client_instruction.id") public static final SqlColumn id = clientInstructionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.424+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.016+02:00", comments="Source field: client_instruction.exam_id") public static final SqlColumn examId = clientInstructionRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.426+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.016+02:00", comments="Source field: client_instruction.connection_token") public static final SqlColumn connectionToken = clientInstructionRecord.connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.426+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.016+02:00", comments="Source field: client_instruction.type") public static final SqlColumn type = clientInstructionRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.426+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.016+02:00", comments="Source field: client_instruction.attributes") public static final SqlColumn attributes = clientInstructionRecord.attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.427+02:00", comments="Source field: client_instruction.needs_confirmation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.016+02:00", comments="Source field: client_instruction.needs_confirmation") public static final SqlColumn needsConfirmation = clientInstructionRecord.needsConfirmation; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.427+02:00", comments="Source field: client_instruction.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.016+02:00", comments="Source field: client_instruction.timestamp") public static final SqlColumn timestamp = clientInstructionRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.424+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.016+02:00", comments="Source Table: client_instruction") public static final class ClientInstructionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java index a039a2f4..bc1d4929 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientInstructionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.427+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.017+02:00", comments="Source Table: client_instruction") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.427+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.017+02:00", comments="Source Table: client_instruction") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.427+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.017+02:00", comments="Source Table: client_instruction") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.427+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.017+02:00", comments="Source Table: client_instruction") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface ClientInstructionRecordMapper { }) ClientInstructionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.427+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.017+02:00", comments="Source Table: client_instruction") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface ClientInstructionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.432+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.017+02:00", comments="Source Table: client_instruction") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.432+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.017+02:00", comments="Source Table: client_instruction") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.432+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.017+02:00", comments="Source Table: client_instruction") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.432+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.023+02:00", comments="Source Table: client_instruction") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface ClientInstructionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.432+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.023+02:00", comments="Source Table: client_instruction") default int insert(ClientInstructionRecord record) { return insert(SqlBuilder.insert(record) .into(clientInstructionRecord) @@ -108,7 +108,7 @@ public interface ClientInstructionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.432+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.023+02:00", comments="Source Table: client_instruction") default int insertSelective(ClientInstructionRecord record) { return insert(SqlBuilder.insert(record) .into(clientInstructionRecord) @@ -122,19 +122,19 @@ public interface ClientInstructionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.432+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.023+02:00", comments="Source Table: client_instruction") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, connectionToken, type, attributes, needsConfirmation, timestamp) .from(clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.432+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.023+02:00", comments="Source Table: client_instruction") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, connectionToken, type, attributes, needsConfirmation, timestamp) .from(clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.433+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.024+02:00", comments="Source Table: client_instruction") default ClientInstructionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, connectionToken, type, attributes, needsConfirmation, timestamp) .from(clientInstructionRecord) @@ -143,7 +143,7 @@ public interface ClientInstructionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.433+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.024+02:00", comments="Source Table: client_instruction") default UpdateDSL> updateByExample(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalTo(record::getExamId) @@ -154,7 +154,7 @@ public interface ClientInstructionRecordMapper { .set(timestamp).equalTo(record::getTimestamp); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.433+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.024+02:00", comments="Source Table: client_instruction") default UpdateDSL> updateByExampleSelective(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -165,7 +165,7 @@ public interface ClientInstructionRecordMapper { .set(timestamp).equalToWhenPresent(record::getTimestamp); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.433+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.024+02:00", comments="Source Table: client_instruction") default int updateByPrimaryKey(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalTo(record::getExamId) @@ -179,7 +179,7 @@ public interface ClientInstructionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.433+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.024+02:00", comments="Source Table: client_instruction") default int updateByPrimaryKeySelective(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordDynamicSqlSupport.java index 813eeda6..ae1bd133 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientNotificationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source Table: client_notification") public static final ClientNotificationRecord clientNotificationRecord = new ClientNotificationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source field: client_notification.id") public static final SqlColumn id = clientNotificationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source field: client_notification.client_connection_id") public static final SqlColumn clientConnectionId = clientNotificationRecord.clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.event_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source field: client_notification.event_type") public static final SqlColumn eventType = clientNotificationRecord.eventType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.notification_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source field: client_notification.notification_type") public static final SqlColumn notificationType = clientNotificationRecord.notificationType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source field: client_notification.value") public static final SqlColumn value = clientNotificationRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source field: client_notification.text") public static final SqlColumn text = clientNotificationRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source Table: client_notification") public static final class ClientNotificationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordMapper.java index 6e6d156b..0d1b46b4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientNotificationRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientNotificationRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source Table: client_notification") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source Table: client_notification") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source Table: client_notification") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source Table: client_notification") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ClientNotificationRecordMapper { }) ClientNotificationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source Table: client_notification") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ClientNotificationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source Table: client_notification") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source Table: client_notification") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientNotificationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source Table: client_notification") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientNotificationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.084+02:00", comments="Source Table: client_notification") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientNotificationRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ClientNotificationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.084+02:00", comments="Source Table: client_notification") default int insert(ClientNotificationRecord record) { return insert(SqlBuilder.insert(record) .into(clientNotificationRecord) @@ -105,7 +105,7 @@ public interface ClientNotificationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.084+02:00", comments="Source Table: client_notification") default int insertSelective(ClientNotificationRecord record) { return insert(SqlBuilder.insert(record) .into(clientNotificationRecord) @@ -118,19 +118,19 @@ public interface ClientNotificationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.480+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.084+02:00", comments="Source Table: client_notification") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, clientConnectionId, eventType, notificationType, value, text) .from(clientNotificationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.480+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.084+02:00", comments="Source Table: client_notification") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, clientConnectionId, eventType, notificationType, value, text) .from(clientNotificationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.480+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.084+02:00", comments="Source Table: client_notification") default ClientNotificationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, clientConnectionId, eventType, notificationType, value, text) .from(clientNotificationRecord) @@ -139,7 +139,7 @@ public interface ClientNotificationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.480+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.084+02:00", comments="Source Table: client_notification") default UpdateDSL> updateByExample(ClientNotificationRecord record) { return UpdateDSL.updateWithMapper(this::update, clientNotificationRecord) .set(clientConnectionId).equalTo(record::getClientConnectionId) @@ -149,7 +149,7 @@ public interface ClientNotificationRecordMapper { .set(text).equalTo(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.480+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.084+02:00", comments="Source Table: client_notification") default UpdateDSL> updateByExampleSelective(ClientNotificationRecord record) { return UpdateDSL.updateWithMapper(this::update, clientNotificationRecord) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) @@ -159,7 +159,7 @@ public interface ClientNotificationRecordMapper { .set(text).equalToWhenPresent(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.480+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.084+02:00", comments="Source Table: client_notification") default int updateByPrimaryKey(ClientNotificationRecord record) { return UpdateDSL.updateWithMapper(this::update, clientNotificationRecord) .set(clientConnectionId).equalTo(record::getClientConnectionId) @@ -172,7 +172,7 @@ public interface ClientNotificationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.480+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.084+02:00", comments="Source Table: client_notification") default int updateByPrimaryKeySelective(ClientNotificationRecord record) { return UpdateDSL.updateWithMapper(this::update, clientNotificationRecord) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java index 3f2e6ec3..acb6c2d5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java @@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationAttributeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.115+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.771+02:00", comments="Source Table: configuration_attribute") public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.118+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.773+02:00", comments="Source field: configuration_attribute.id") public static final SqlColumn id = configurationAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.119+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.774+02:00", comments="Source field: configuration_attribute.name") public static final SqlColumn name = configurationAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.119+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.774+02:00", comments="Source field: configuration_attribute.type") public static final SqlColumn type = configurationAttributeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.119+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.775+02:00", comments="Source field: configuration_attribute.parent_id") public static final SqlColumn parentId = configurationAttributeRecord.parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.119+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.775+02:00", comments="Source field: configuration_attribute.resources") public static final SqlColumn resources = configurationAttributeRecord.resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.120+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.775+02:00", comments="Source field: configuration_attribute.validator") public static final SqlColumn validator = configurationAttributeRecord.validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.120+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.775+02:00", comments="Source field: configuration_attribute.dependencies") public static final SqlColumn dependencies = configurationAttributeRecord.dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.120+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.775+02:00", comments="Source field: configuration_attribute.default_value") public static final SqlColumn defaultValue = configurationAttributeRecord.defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.117+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.773+02:00", comments="Source Table: configuration_attribute") public static final class ConfigurationAttributeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java index 95474616..92f7b619 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationAttributeRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.121+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.776+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.123+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.778+02:00", comments="Source Table: configuration_attribute") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.124+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.779+02:00", comments="Source Table: configuration_attribute") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.126+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.780+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationAttributeRecordMapper { }) ConfigurationAttributeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.127+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.781+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ConfigurationAttributeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.128+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.782+02:00", comments="Source Table: configuration_attribute") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.129+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.783+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.129+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.784+02:00", comments="Source Table: configuration_attribute") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.130+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.785+02:00", comments="Source Table: configuration_attribute") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.131+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.785+02:00", comments="Source Table: configuration_attribute") default int insert(ConfigurationAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationAttributeRecord) @@ -111,7 +111,7 @@ public interface ConfigurationAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.132+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.787+02:00", comments="Source Table: configuration_attribute") default int insertSelective(ConfigurationAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationAttributeRecord) @@ -126,19 +126,19 @@ public interface ConfigurationAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.133+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.787+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.134+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.788+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.135+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.789+02:00", comments="Source Table: configuration_attribute") default ConfigurationAttributeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord) @@ -147,7 +147,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.136+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.790+02:00", comments="Source Table: configuration_attribute") default UpdateDSL> updateByExample(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalTo(record::getName) @@ -159,7 +159,7 @@ public interface ConfigurationAttributeRecordMapper { .set(defaultValue).equalTo(record::getDefaultValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.137+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.791+02:00", comments="Source Table: configuration_attribute") default UpdateDSL> updateByExampleSelective(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalToWhenPresent(record::getName) @@ -171,7 +171,7 @@ public interface ConfigurationAttributeRecordMapper { .set(defaultValue).equalToWhenPresent(record::getDefaultValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.138+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.792+02:00", comments="Source Table: configuration_attribute") default int updateByPrimaryKey(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalTo(record::getName) @@ -186,7 +186,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.138+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.792+02:00", comments="Source Table: configuration_attribute") default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java index 6255a605..fa495a3d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java @@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationNodeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.388+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.964+02:00", comments="Source Table: configuration_node") public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.389+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.964+02:00", comments="Source field: configuration_node.id") public static final SqlColumn id = configurationNodeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.389+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.965+02:00", comments="Source field: configuration_node.institution_id") public static final SqlColumn institutionId = configurationNodeRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.389+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.965+02:00", comments="Source field: configuration_node.template_id") public static final SqlColumn templateId = configurationNodeRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.389+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.965+02:00", comments="Source field: configuration_node.owner") public static final SqlColumn owner = configurationNodeRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.389+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.965+02:00", comments="Source field: configuration_node.name") public static final SqlColumn name = configurationNodeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.390+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.965+02:00", comments="Source field: configuration_node.description") public static final SqlColumn description = configurationNodeRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.390+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.966+02:00", comments="Source field: configuration_node.type") public static final SqlColumn type = configurationNodeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.390+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.966+02:00", comments="Source field: configuration_node.status") public static final SqlColumn status = configurationNodeRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.389+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.964+02:00", comments="Source Table: configuration_node") public static final class ConfigurationNodeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java index bd357a62..af003371 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationNodeRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.390+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.966+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.390+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.966+02:00", comments="Source Table: configuration_node") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.390+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.966+02:00", comments="Source Table: configuration_node") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.390+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.966+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationNodeRecordMapper { }) ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.390+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.967+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ConfigurationNodeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.390+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.968+02:00", comments="Source Table: configuration_node") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.391+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.968+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.391+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.968+02:00", comments="Source Table: configuration_node") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.391+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.968+02:00", comments="Source Table: configuration_node") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.391+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.968+02:00", comments="Source Table: configuration_node") default int insert(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -111,7 +111,7 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.391+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.968+02:00", comments="Source Table: configuration_node") default int insertSelective(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -126,19 +126,19 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.391+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.968+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.391+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.968+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.392+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.969+02:00", comments="Source Table: configuration_node") default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord) @@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.392+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.969+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExample(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -159,7 +159,7 @@ public interface ConfigurationNodeRecordMapper { .set(status).equalTo(record::getStatus); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.392+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.969+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExampleSelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -171,7 +171,7 @@ public interface ConfigurationNodeRecordMapper { .set(status).equalToWhenPresent(record::getStatus); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.392+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.969+02:00", comments="Source Table: configuration_node") default int updateByPrimaryKey(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -186,7 +186,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.392+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.969+02:00", comments="Source Table: configuration_node") default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java index 24c4eaf5..5d4d495a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java @@ -7,28 +7,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.384+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.958+02:00", comments="Source Table: configuration") public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.384+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.958+02:00", comments="Source field: configuration.id") public static final SqlColumn id = configurationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.384+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.958+02:00", comments="Source field: configuration.institution_id") public static final SqlColumn institutionId = configurationRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.384+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.959+02:00", comments="Source field: configuration.configuration_node_id") public static final SqlColumn configurationNodeId = configurationRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.959+02:00", comments="Source field: configuration.version") public static final SqlColumn version = configurationRecord.version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.959+02:00", comments="Source field: configuration.version_date") public static final SqlColumn versionDate = configurationRecord.versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.959+02:00", comments="Source field: configuration.followup") public static final SqlColumn followup = configurationRecord.followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.384+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.958+02:00", comments="Source Table: configuration") public static final class ConfigurationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java index 10dc1b5e..e29294ba 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.960+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.960+02:00", comments="Source Table: configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.960+02:00", comments="Source Table: configuration") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.960+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationRecordMapper { }) ConfigurationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.960+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface ConfigurationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.960+02:00", comments="Source Table: configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.960+02:00", comments="Source Table: configuration") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.960+02:00", comments="Source Table: configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.385+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.960+02:00", comments="Source Table: configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.386+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.961+02:00", comments="Source Table: configuration") default int insert(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -107,7 +107,7 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.386+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.961+02:00", comments="Source Table: configuration") default int insertSelective(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -120,19 +120,19 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.386+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.961+02:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.386+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.961+02:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.386+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.961+02:00", comments="Source Table: configuration") default ConfigurationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord) @@ -141,7 +141,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.386+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.961+02:00", comments="Source Table: configuration") default UpdateDSL> updateByExample(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -151,7 +151,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalTo(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.386+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.961+02:00", comments="Source Table: configuration") default UpdateDSL> updateByExampleSelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -161,7 +161,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalToWhenPresent(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.386+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.961+02:00", comments="Source Table: configuration") default int updateByPrimaryKey(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -174,7 +174,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.386+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.962+02:00", comments="Source Table: configuration") default int updateByPrimaryKeySelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java index 26dfb973..5854f1d4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationValueRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.350+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.934+02:00", comments="Source Table: configuration_value") public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.350+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.934+02:00", comments="Source field: configuration_value.id") public static final SqlColumn id = configurationValueRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.350+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.934+02:00", comments="Source field: configuration_value.institution_id") public static final SqlColumn institutionId = configurationValueRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.351+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.934+02:00", comments="Source field: configuration_value.configuration_id") public static final SqlColumn configurationId = configurationValueRecord.configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.353+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.934+02:00", comments="Source field: configuration_value.configuration_attribute_id") public static final SqlColumn configurationAttributeId = configurationValueRecord.configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.354+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.934+02:00", comments="Source field: configuration_value.list_index") public static final SqlColumn listIndex = configurationValueRecord.listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.354+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.935+02:00", comments="Source field: configuration_value.value") public static final SqlColumn value = configurationValueRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.350+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.934+02:00", comments="Source Table: configuration_value") public static final class ConfigurationValueRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java index 64a3bc4d..f8ef9430 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java @@ -31,19 +31,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationValueRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.361+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.935+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.361+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.935+02:00", comments="Source Table: configuration_value") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.361+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.935+02:00", comments="Source Table: configuration_value") @InsertProvider(type=SqlProviderAdapter.class, method="insert") int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.362+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.935+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -55,7 +55,7 @@ public interface ConfigurationValueRecordMapper { }) ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.362+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.935+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface ConfigurationValueRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.362+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.936+02:00", comments="Source Table: configuration_value") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.362+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.936+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.363+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.936+02:00", comments="Source Table: configuration_value") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.363+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.936+02:00", comments="Source Table: configuration_value") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.363+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.936+02:00", comments="Source Table: configuration_value") default int insert(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -104,7 +104,7 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.363+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.936+02:00", comments="Source Table: configuration_value") default int insertSelective(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -118,19 +118,19 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.363+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.937+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.363+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.937+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.363+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.937+02:00", comments="Source Table: configuration_value") default ConfigurationValueRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord) @@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.363+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.937+02:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExample(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(id).equalTo(record::getId) @@ -150,7 +150,7 @@ public interface ConfigurationValueRecordMapper { .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.364+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.937+02:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExampleSelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(id).equalToWhenPresent(record::getId) @@ -161,7 +161,7 @@ public interface ConfigurationValueRecordMapper { .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.364+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.937+02:00", comments="Source Table: configuration_value") default int updateByPrimaryKey(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -174,7 +174,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.364+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.938+02:00", comments="Source Table: configuration_value") default int updateByPrimaryKeySelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java index 1721cc65..9aede691 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamConfigurationMapRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.394+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.975+02:00", comments="Source Table: exam_configuration_map") public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.394+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.975+02:00", comments="Source field: exam_configuration_map.id") public static final SqlColumn id = examConfigurationMapRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.394+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.975+02:00", comments="Source field: exam_configuration_map.institution_id") public static final SqlColumn institutionId = examConfigurationMapRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.394+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.975+02:00", comments="Source field: exam_configuration_map.exam_id") public static final SqlColumn examId = examConfigurationMapRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.394+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.975+02:00", comments="Source field: exam_configuration_map.configuration_node_id") public static final SqlColumn configurationNodeId = examConfigurationMapRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.394+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.976+02:00", comments="Source field: exam_configuration_map.user_names") public static final SqlColumn userNames = examConfigurationMapRecord.userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.394+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.976+02:00", comments="Source field: exam_configuration_map.encrypt_secret") public static final SqlColumn encryptSecret = examConfigurationMapRecord.encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.394+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.975+02:00", comments="Source Table: exam_configuration_map") public static final class ExamConfigurationMapRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java index b1ac2a79..d2a8e28e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamConfigurationMapRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.976+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.976+02:00", comments="Source Table: exam_configuration_map") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.976+02:00", comments="Source Table: exam_configuration_map") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.976+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ExamConfigurationMapRecordMapper { }) ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.976+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ExamConfigurationMapRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.976+02:00", comments="Source Table: exam_configuration_map") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default int insert(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -105,7 +105,7 @@ public interface ExamConfigurationMapRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default int insertSelective(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -118,19 +118,19 @@ public interface ExamConfigurationMapRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.395+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) .from(examConfigurationMapRecord) @@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.396+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExample(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -149,7 +149,7 @@ public interface ExamConfigurationMapRecordMapper { .set(encryptSecret).equalTo(record::getEncryptSecret); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.396+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExampleSelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -159,7 +159,7 @@ public interface ExamConfigurationMapRecordMapper { .set(encryptSecret).equalToWhenPresent(record::getEncryptSecret); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.396+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKey(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -172,7 +172,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.396+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.977+02:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java index 7e24734d..b162b897 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java @@ -6,58 +6,58 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.399+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.983+02:00", comments="Source Table: exam") public static final ExamRecord examRecord = new ExamRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.399+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.983+02:00", comments="Source field: exam.id") public static final SqlColumn id = examRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.399+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.983+02:00", comments="Source field: exam.institution_id") public static final SqlColumn institutionId = examRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.399+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.984+02:00", comments="Source field: exam.lms_setup_id") public static final SqlColumn lmsSetupId = examRecord.lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.400+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.984+02:00", comments="Source field: exam.external_id") public static final SqlColumn externalId = examRecord.externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.400+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.984+02:00", comments="Source field: exam.owner") public static final SqlColumn owner = examRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.400+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.984+02:00", comments="Source field: exam.supporter") public static final SqlColumn supporter = examRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.400+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.984+02:00", comments="Source field: exam.type") public static final SqlColumn type = examRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.400+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.984+02:00", comments="Source field: exam.quit_password") public static final SqlColumn quitPassword = examRecord.quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.400+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.985+02:00", comments="Source field: exam.browser_keys") public static final SqlColumn browserKeys = examRecord.browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.400+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.985+02:00", comments="Source field: exam.status") public static final SqlColumn status = examRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.400+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.985+02:00", comments="Source field: exam.lms_seb_restriction") public static final SqlColumn lmsSebRestriction = examRecord.lmsSebRestriction; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.400+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.985+02:00", comments="Source field: exam.updating") public static final SqlColumn updating = examRecord.updating; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.401+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.986+02:00", comments="Source field: exam.lastupdate") public static final SqlColumn lastupdate = examRecord.lastupdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.401+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.986+02:00", comments="Source field: exam.active") public static final SqlColumn active = examRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.401+02:00", comments="Source field: exam.exam_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.986+02:00", comments="Source field: exam.exam_template_id") public static final SqlColumn examTemplateId = examRecord.examTemplateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.401+02:00", comments="Source field: exam.last_modified") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.986+02:00", comments="Source field: exam.last_modified") public static final SqlColumn lastModified = examRecord.lastModified; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.399+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.983+02:00", comments="Source Table: exam") public static final class ExamRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java index 9d45cf86..69dd2593 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.401+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.986+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.401+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.987+02:00", comments="Source Table: exam") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.401+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.987+02:00", comments="Source Table: exam") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.401+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.987+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,7 +67,7 @@ public interface ExamRecordMapper { }) ExamRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.401+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.987+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -89,22 +89,22 @@ public interface ExamRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.990+02:00", comments="Source Table: exam") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.990+02:00", comments="Source Table: exam") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.990+02:00", comments="Source Table: exam") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.991+02:00", comments="Source Table: exam") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord) .where(id, isEqualTo(id_)) @@ -112,7 +112,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.991+02:00", comments="Source Table: exam") default int insert(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -135,7 +135,7 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.991+02:00", comments="Source Table: exam") default int insertSelective(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -158,19 +158,19 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.991+02:00", comments="Source Table: exam") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active, examTemplateId, lastModified) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.991+02:00", comments="Source Table: exam") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active, examTemplateId, lastModified) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.991+02:00", comments="Source Table: exam") default ExamRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active, examTemplateId, lastModified) .from(examRecord) @@ -179,7 +179,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.991+02:00", comments="Source Table: exam") default UpdateDSL> updateByExample(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -199,7 +199,7 @@ public interface ExamRecordMapper { .set(lastModified).equalTo(record::getLastModified); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.992+02:00", comments="Source Table: exam") default UpdateDSL> updateByExampleSelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -219,7 +219,7 @@ public interface ExamRecordMapper { .set(lastModified).equalToWhenPresent(record::getLastModified); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.402+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.992+02:00", comments="Source Table: exam") default int updateByPrimaryKey(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -242,7 +242,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.403+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.992+02:00", comments="Source Table: exam") default int updateByPrimaryKeySelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordDynamicSqlSupport.java index 81db647a..f6c6213c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordDynamicSqlSupport.java @@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamTemplateRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source Table: exam_template") public static final ExamTemplateRecord examTemplateRecord = new ExamTemplateRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.id") public static final SqlColumn id = examTemplateRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source field: exam_template.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.institution_id") public static final SqlColumn institutionId = examTemplateRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source field: exam_template.configuration_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.configuration_template_id") public static final SqlColumn configurationTemplateId = examTemplateRecord.configurationTemplateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source field: exam_template.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.name") public static final SqlColumn name = examTemplateRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source field: exam_template.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.description") public static final SqlColumn description = examTemplateRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source field: exam_template.exam_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.exam_type") public static final SqlColumn examType = examTemplateRecord.examType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source field: exam_template.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.supporter") public static final SqlColumn supporter = examTemplateRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source field: exam_template.indicator_templates") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.indicator_templates") public static final SqlColumn indicatorTemplates = examTemplateRecord.indicatorTemplates; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source field: exam_template.institutional_default") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.institutional_default") public static final SqlColumn institutionalDefault = examTemplateRecord.institutionalDefault; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source Table: exam_template") public static final class ExamTemplateRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordMapper.java index 81a1f442..e9ef77c0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamTemplateRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamTemplateRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source Table: exam_template") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source Table: exam_template") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source Table: exam_template") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source Table: exam_template") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -60,7 +60,7 @@ public interface ExamTemplateRecordMapper { }) ExamTemplateRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface ExamTemplateRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examTemplateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examTemplateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examTemplateRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface ExamTemplateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default int insert(ExamTemplateRecord record) { return insert(SqlBuilder.insert(record) .into(examTemplateRecord) @@ -114,7 +114,7 @@ public interface ExamTemplateRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default int insertSelective(ExamTemplateRecord record) { return insert(SqlBuilder.insert(record) .into(examTemplateRecord) @@ -130,19 +130,19 @@ public interface ExamTemplateRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationTemplateId, name, description, examType, supporter, indicatorTemplates, institutionalDefault) .from(examTemplateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationTemplateId, name, description, examType, supporter, indicatorTemplates, institutionalDefault) .from(examTemplateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default ExamTemplateRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationTemplateId, name, description, examType, supporter, indicatorTemplates, institutionalDefault) .from(examTemplateRecord) @@ -151,7 +151,7 @@ public interface ExamTemplateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default UpdateDSL> updateByExample(ExamTemplateRecord record) { return UpdateDSL.updateWithMapper(this::update, examTemplateRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -164,7 +164,7 @@ public interface ExamTemplateRecordMapper { .set(institutionalDefault).equalTo(record::getInstitutionalDefault); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default UpdateDSL> updateByExampleSelective(ExamTemplateRecord record) { return UpdateDSL.updateWithMapper(this::update, examTemplateRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -177,7 +177,7 @@ public interface ExamTemplateRecordMapper { .set(institutionalDefault).equalToWhenPresent(record::getInstitutionalDefault); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default int updateByPrimaryKey(ExamTemplateRecord record) { return UpdateDSL.updateWithMapper(this::update, examTemplateRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -193,7 +193,7 @@ public interface ExamTemplateRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.472+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.074+02:00", comments="Source Table: exam_template") default int updateByPrimaryKeySelective(ExamTemplateRecord record) { return UpdateDSL.updateWithMapper(this::update, examTemplateRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java index 56cf6cad..6f08c720 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java @@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class IndicatorRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.026+02:00", comments="Source Table: indicator") public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.026+02:00", comments="Source field: indicator.id") public static final SqlColumn id = indicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.026+02:00", comments="Source field: indicator.exam_id") public static final SqlColumn examId = indicatorRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.435+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.026+02:00", comments="Source field: indicator.type") public static final SqlColumn type = indicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.435+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.026+02:00", comments="Source field: indicator.name") public static final SqlColumn name = indicatorRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.435+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.027+02:00", comments="Source field: indicator.color") public static final SqlColumn color = indicatorRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.435+02:00", comments="Source field: indicator.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.027+02:00", comments="Source field: indicator.icon") public static final SqlColumn icon = indicatorRecord.icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.435+02:00", comments="Source field: indicator.tags") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.027+02:00", comments="Source field: indicator.tags") public static final SqlColumn tags = indicatorRecord.tags; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.026+02:00", comments="Source Table: indicator") public static final class IndicatorRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java index 28fbe09b..e6e64090 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface IndicatorRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.435+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.027+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.435+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.027+02:00", comments="Source Table: indicator") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.435+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.027+02:00", comments="Source Table: indicator") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.435+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.027+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface IndicatorRecordMapper { }) IndicatorRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.435+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.028+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface IndicatorRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.028+02:00", comments="Source Table: indicator") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.028+02:00", comments="Source Table: indicator") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.028+02:00", comments="Source Table: indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.028+02:00", comments="Source Table: indicator") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.028+02:00", comments="Source Table: indicator") default int insert(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -108,7 +108,7 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.028+02:00", comments="Source Table: indicator") default int insertSelective(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -122,19 +122,19 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.028+02:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, type, name, color, icon, tags) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.029+02:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, type, name, color, icon, tags) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.029+02:00", comments="Source Table: indicator") default IndicatorRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, type, name, color, icon, tags) .from(indicatorRecord) @@ -143,7 +143,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.029+02:00", comments="Source Table: indicator") default UpdateDSL> updateByExample(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -154,7 +154,7 @@ public interface IndicatorRecordMapper { .set(tags).equalTo(record::getTags); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.029+02:00", comments="Source Table: indicator") default UpdateDSL> updateByExampleSelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -165,7 +165,7 @@ public interface IndicatorRecordMapper { .set(tags).equalToWhenPresent(record::getTags); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.029+02:00", comments="Source Table: indicator") default int updateByPrimaryKey(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -179,7 +179,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.436+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.029+02:00", comments="Source Table: indicator") default int updateByPrimaryKeySelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java index f49b2cbd..d75a9d74 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class InstitutionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.441+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source Table: institution") public static final InstitutionRecord institutionRecord = new InstitutionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.441+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.id") public static final SqlColumn id = institutionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.442+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.035+02:00", comments="Source field: institution.name") public static final SqlColumn name = institutionRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.442+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.036+02:00", comments="Source field: institution.url_suffix") public static final SqlColumn urlSuffix = institutionRecord.urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.442+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.037+02:00", comments="Source field: institution.theme_name") public static final SqlColumn themeName = institutionRecord.themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.442+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.037+02:00", comments="Source field: institution.active") public static final SqlColumn active = institutionRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.442+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.037+02:00", comments="Source field: institution.logo_image") public static final SqlColumn logoImage = institutionRecord.logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.441+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source Table: institution") public static final class InstitutionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java index a229360c..bc6ddc2a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface InstitutionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.442+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.037+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.442+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.037+02:00", comments="Source Table: institution") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.442+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.037+02:00", comments="Source Table: institution") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.038+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface InstitutionRecordMapper { }) InstitutionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.039+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface InstitutionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default int insert(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -105,7 +105,7 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default int insertSelective(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -118,19 +118,19 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default InstitutionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord) @@ -139,7 +139,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default UpdateDSL> updateByExample(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -149,7 +149,7 @@ public interface InstitutionRecordMapper { .set(logoImage).equalTo(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default UpdateDSL> updateByExampleSelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) @@ -159,7 +159,7 @@ public interface InstitutionRecordMapper { .set(logoImage).equalToWhenPresent(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.040+02:00", comments="Source Table: institution") default int updateByPrimaryKey(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -172,7 +172,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.443+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.041+02:00", comments="Source Table: institution") default int updateByPrimaryKeySelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java index a1ebe1cc..d70e032f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java @@ -6,52 +6,52 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class LmsSetupRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.451+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source Table: lms_setup") public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.451+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.id") public static final SqlColumn id = lmsSetupRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.451+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.institution_id") public static final SqlColumn institutionId = lmsSetupRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.451+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.name") public static final SqlColumn name = lmsSetupRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.451+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.lms_type") public static final SqlColumn lmsType = lmsSetupRecord.lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.451+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.lms_url") public static final SqlColumn lmsUrl = lmsSetupRecord.lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.451+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.lms_clientname") public static final SqlColumn lmsClientname = lmsSetupRecord.lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.451+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.lms_clientsecret") public static final SqlColumn lmsClientsecret = lmsSetupRecord.lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source field: lms_setup.lms_rest_api_token") public static final SqlColumn lmsRestApiToken = lmsSetupRecord.lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source field: lms_setup.lms_proxy_host") public static final SqlColumn lmsProxyHost = lmsSetupRecord.lmsProxyHost; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source field: lms_setup.lms_proxy_port") public static final SqlColumn lmsProxyPort = lmsSetupRecord.lmsProxyPort; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") public static final SqlColumn lmsProxyAuthUsername = lmsSetupRecord.lmsProxyAuthUsername; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") public static final SqlColumn lmsProxyAuthSecret = lmsSetupRecord.lmsProxyAuthSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source field: lms_setup.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source field: lms_setup.update_time") public static final SqlColumn updateTime = lmsSetupRecord.updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source field: lms_setup.active") public static final SqlColumn active = lmsSetupRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.451+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source Table: lms_setup") public static final class LmsSetupRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java index 8293f352..a63ce9ae 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface LmsSetupRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source Table: lms_setup") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source Table: lms_setup") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,7 +65,7 @@ public interface LmsSetupRecordMapper { }) LmsSetupRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -85,22 +85,22 @@ public interface LmsSetupRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source Table: lms_setup") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.452+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.048+02:00", comments="Source Table: lms_setup") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord) .where(id, isEqualTo(id_)) @@ -108,7 +108,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default int insert(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -129,7 +129,7 @@ public interface LmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default int insertSelective(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -150,19 +150,19 @@ public interface LmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, updateTime, active) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, updateTime, active) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default LmsSetupRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, updateTime, active) .from(lmsSetupRecord) @@ -171,7 +171,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExample(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -189,7 +189,7 @@ public interface LmsSetupRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExampleSelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -207,7 +207,7 @@ public interface LmsSetupRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default int updateByPrimaryKey(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -228,7 +228,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.453+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.049+02:00", comments="Source Table: lms_setup") default int updateByPrimaryKeySelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java index 34ca0c78..1c25af63 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java @@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class OrientationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.374+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.947+02:00", comments="Source Table: orientation") public static final OrientationRecord orientationRecord = new OrientationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.374+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.948+02:00", comments="Source field: orientation.id") public static final SqlColumn id = orientationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.375+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.948+02:00", comments="Source field: orientation.config_attribute_id") public static final SqlColumn configAttributeId = orientationRecord.configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.376+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.948+02:00", comments="Source field: orientation.template_id") public static final SqlColumn templateId = orientationRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.377+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.949+02:00", comments="Source field: orientation.view_id") public static final SqlColumn viewId = orientationRecord.viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.377+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.949+02:00", comments="Source field: orientation.group_id") public static final SqlColumn groupId = orientationRecord.groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.378+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.949+02:00", comments="Source field: orientation.x_position") public static final SqlColumn xPosition = orientationRecord.xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.380+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.950+02:00", comments="Source field: orientation.y_position") public static final SqlColumn yPosition = orientationRecord.yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.380+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.951+02:00", comments="Source field: orientation.width") public static final SqlColumn width = orientationRecord.width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.380+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.951+02:00", comments="Source field: orientation.height") public static final SqlColumn height = orientationRecord.height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.380+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.951+02:00", comments="Source field: orientation.title") public static final SqlColumn title = orientationRecord.title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.374+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.948+02:00", comments="Source Table: orientation") public static final class OrientationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java index df035bee..fc0a7172 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface OrientationRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.380+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.951+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.380+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.951+02:00", comments="Source Table: orientation") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.381+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.952+02:00", comments="Source Table: orientation") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.381+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.952+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface OrientationRecordMapper { }) OrientationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.381+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.952+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -77,22 +77,22 @@ public interface OrientationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.381+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.952+02:00", comments="Source Table: orientation") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.381+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.952+02:00", comments="Source Table: orientation") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.381+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.952+02:00", comments="Source Table: orientation") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.381+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.952+02:00", comments="Source Table: orientation") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.381+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.952+02:00", comments="Source Table: orientation") default int insert(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -117,7 +117,7 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.381+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.952+02:00", comments="Source Table: orientation") default int insertSelective(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -134,19 +134,19 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.382+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.953+02:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.382+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.953+02:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.382+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.953+02:00", comments="Source Table: orientation") default OrientationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord) @@ -155,7 +155,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.382+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.953+02:00", comments="Source Table: orientation") default UpdateDSL> updateByExample(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -169,7 +169,7 @@ public interface OrientationRecordMapper { .set(title).equalTo(record::getTitle); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.382+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.953+02:00", comments="Source Table: orientation") default UpdateDSL> updateByExampleSelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) @@ -183,7 +183,7 @@ public interface OrientationRecordMapper { .set(title).equalToWhenPresent(record::getTitle); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.382+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.953+02:00", comments="Source Table: orientation") default int updateByPrimaryKey(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -200,7 +200,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.382+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.953+02:00", comments="Source Table: orientation") default int updateByPrimaryKeySelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java index 20aaeeb7..685de658 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java @@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class RemoteProctoringRoomRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.006+02:00", comments="Source Table: remote_proctoring_room") public static final RemoteProctoringRoomRecord remoteProctoringRoomRecord = new RemoteProctoringRoomRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.413+02:00", comments="Source field: remote_proctoring_room.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.006+02:00", comments="Source field: remote_proctoring_room.id") public static final SqlColumn id = remoteProctoringRoomRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.413+02:00", comments="Source field: remote_proctoring_room.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.007+02:00", comments="Source field: remote_proctoring_room.exam_id") public static final SqlColumn examId = remoteProctoringRoomRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.413+02:00", comments="Source field: remote_proctoring_room.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.007+02:00", comments="Source field: remote_proctoring_room.name") public static final SqlColumn name = remoteProctoringRoomRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.413+02:00", comments="Source field: remote_proctoring_room.size") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.007+02:00", comments="Source field: remote_proctoring_room.size") public static final SqlColumn size = remoteProctoringRoomRecord.size; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.413+02:00", comments="Source field: remote_proctoring_room.subject") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.007+02:00", comments="Source field: remote_proctoring_room.subject") public static final SqlColumn subject = remoteProctoringRoomRecord.subject; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.413+02:00", comments="Source field: remote_proctoring_room.townhall_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.007+02:00", comments="Source field: remote_proctoring_room.townhall_room") public static final SqlColumn townhallRoom = remoteProctoringRoomRecord.townhallRoom; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.413+02:00", comments="Source field: remote_proctoring_room.break_out_connections") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.007+02:00", comments="Source field: remote_proctoring_room.break_out_connections") public static final SqlColumn breakOutConnections = remoteProctoringRoomRecord.breakOutConnections; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.413+02:00", comments="Source field: remote_proctoring_room.join_key") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.007+02:00", comments="Source field: remote_proctoring_room.join_key") public static final SqlColumn joinKey = remoteProctoringRoomRecord.joinKey; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.413+02:00", comments="Source field: remote_proctoring_room.room_data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.007+02:00", comments="Source field: remote_proctoring_room.room_data") public static final SqlColumn roomData = remoteProctoringRoomRecord.roomData; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.006+02:00", comments="Source Table: remote_proctoring_room") public static final class RemoteProctoringRoomRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java index ffd8ff3f..99e21f40 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface RemoteProctoringRoomRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.415+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.007+02:00", comments="Source Table: remote_proctoring_room") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.415+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.415+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.415+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -60,7 +60,7 @@ public interface RemoteProctoringRoomRecordMapper { }) RemoteProctoringRoomRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface RemoteProctoringRoomRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(remoteProctoringRoomRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, remoteProctoringRoomRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, remoteProctoringRoomRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface RemoteProctoringRoomRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") default int insert(RemoteProctoringRoomRecord record) { return insert(SqlBuilder.insert(record) .into(remoteProctoringRoomRecord) @@ -114,7 +114,7 @@ public interface RemoteProctoringRoomRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") default int insertSelective(RemoteProctoringRoomRecord record) { return insert(SqlBuilder.insert(record) .into(remoteProctoringRoomRecord) @@ -130,19 +130,19 @@ public interface RemoteProctoringRoomRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, name, size, subject, townhallRoom, breakOutConnections, joinKey, roomData) .from(remoteProctoringRoomRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, name, size, subject, townhallRoom, breakOutConnections, joinKey, roomData) .from(remoteProctoringRoomRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.008+02:00", comments="Source Table: remote_proctoring_room") default RemoteProctoringRoomRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, name, size, subject, townhallRoom, breakOutConnections, joinKey, roomData) .from(remoteProctoringRoomRecord) @@ -151,7 +151,7 @@ public interface RemoteProctoringRoomRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.416+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.009+02:00", comments="Source Table: remote_proctoring_room") default UpdateDSL> updateByExample(RemoteProctoringRoomRecord record) { return UpdateDSL.updateWithMapper(this::update, remoteProctoringRoomRecord) .set(examId).equalTo(record::getExamId) @@ -164,7 +164,7 @@ public interface RemoteProctoringRoomRecordMapper { .set(roomData).equalTo(record::getRoomData); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.417+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.009+02:00", comments="Source Table: remote_proctoring_room") default UpdateDSL> updateByExampleSelective(RemoteProctoringRoomRecord record) { return UpdateDSL.updateWithMapper(this::update, remoteProctoringRoomRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -177,7 +177,7 @@ public interface RemoteProctoringRoomRecordMapper { .set(roomData).equalToWhenPresent(record::getRoomData); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.417+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.009+02:00", comments="Source Table: remote_proctoring_room") default int updateByPrimaryKey(RemoteProctoringRoomRecord record) { return UpdateDSL.updateWithMapper(this::update, remoteProctoringRoomRecord) .set(examId).equalTo(record::getExamId) @@ -193,7 +193,7 @@ public interface RemoteProctoringRoomRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.417+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.009+02:00", comments="Source Table: remote_proctoring_room") default int updateByPrimaryKeySelective(RemoteProctoringRoomRecord record) { return UpdateDSL.updateWithMapper(this::update, remoteProctoringRoomRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java index 224cefb6..2a87587f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java @@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class RoleRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.055+02:00", comments="Source Table: user_role") public static final RoleRecord roleRecord = new RoleRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.055+02:00", comments="Source field: user_role.id") public static final SqlColumn id = roleRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.056+02:00", comments="Source field: user_role.user_id") public static final SqlColumn userId = roleRecord.userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.056+02:00", comments="Source field: user_role.role_name") public static final SqlColumn roleName = roleRecord.roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.055+02:00", comments="Source Table: user_role") public static final class RoleRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java index 7ea3d897..4cdbc566 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface RoleRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.056+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.056+02:00", comments="Source Table: user_role") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.056+02:00", comments="Source Table: user_role") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.056+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -54,7 +54,7 @@ public interface RoleRecordMapper { }) RoleRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.056+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -63,22 +63,22 @@ public interface RoleRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.056+02:00", comments="Source Table: user_role") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord) .where(id, isEqualTo(id_)) @@ -86,7 +86,7 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default int insert(RoleRecord record) { return insert(SqlBuilder.insert(record) .into(roleRecord) @@ -96,7 +96,7 @@ public interface RoleRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default int insertSelective(RoleRecord record) { return insert(SqlBuilder.insert(record) .into(roleRecord) @@ -106,19 +106,19 @@ public interface RoleRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, userId, roleName) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userId, roleName) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default RoleRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, userId, roleName) .from(roleRecord) @@ -127,21 +127,21 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default UpdateDSL> updateByExample(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalTo(record::getUserId) .set(roleName).equalTo(record::getRoleName); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default UpdateDSL> updateByExampleSelective(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalToWhenPresent(record::getUserId) .set(roleName).equalToWhenPresent(record::getRoleName); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default int updateByPrimaryKey(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalTo(record::getUserId) @@ -151,7 +151,7 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_role") default int updateByPrimaryKeySelective(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalToWhenPresent(record::getUserId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java index 30838229..a86c97ef 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java @@ -7,34 +7,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class SebClientConfigRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.445+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source Table: seb_client_configuration") public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.445+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source field: seb_client_configuration.id") public static final SqlColumn id = sebClientConfigRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.447+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source field: seb_client_configuration.institution_id") public static final SqlColumn institutionId = sebClientConfigRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.447+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source field: seb_client_configuration.name") public static final SqlColumn name = sebClientConfigRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.447+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source field: seb_client_configuration.date") public static final SqlColumn date = sebClientConfigRecord.date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source field: seb_client_configuration.client_name") public static final SqlColumn clientName = sebClientConfigRecord.clientName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source field: seb_client_configuration.client_secret") public static final SqlColumn clientSecret = sebClientConfigRecord.clientSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source field: seb_client_configuration.encrypt_secret") public static final SqlColumn encryptSecret = sebClientConfigRecord.encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source field: seb_client_configuration.active") public static final SqlColumn active = sebClientConfigRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.445+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source Table: seb_client_configuration") public static final class SebClientConfigRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java index 22dfcb51..12ed2c49 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface SebClientConfigRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source Table: seb_client_configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source Table: seb_client_configuration") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface SebClientConfigRecordMapper { }) SebClientConfigRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface SebClientConfigRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source Table: seb_client_configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.044+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default int insert(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -113,7 +113,7 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default int insertSelective(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -128,19 +128,19 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.448+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.449+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.449+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default SebClientConfigRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord) @@ -149,7 +149,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.449+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExample(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -161,7 +161,7 @@ public interface SebClientConfigRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.449+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExampleSelective(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -173,7 +173,7 @@ public interface SebClientConfigRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.449+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default int updateByPrimaryKey(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -188,7 +188,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.449+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.045+02:00", comments="Source Table: seb_client_configuration") default int updateByPrimaryKeySelective(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java index 6a7b69cd..6d32859f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java @@ -7,25 +7,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ThresholdRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.031+02:00", comments="Source Table: threshold") public static final ThresholdRecord thresholdRecord = new ThresholdRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.438+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.031+02:00", comments="Source field: threshold.id") public static final SqlColumn id = thresholdRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.438+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.031+02:00", comments="Source field: threshold.indicator_id") public static final SqlColumn indicatorId = thresholdRecord.indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.438+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.031+02:00", comments="Source field: threshold.value") public static final SqlColumn value = thresholdRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.438+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.032+02:00", comments="Source field: threshold.color") public static final SqlColumn color = thresholdRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.438+02:00", comments="Source field: threshold.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.032+02:00", comments="Source field: threshold.icon") public static final SqlColumn icon = thresholdRecord.icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.438+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.031+02:00", comments="Source Table: threshold") public static final class ThresholdRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java index a116f3b4..e1308699 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java @@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ThresholdRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.032+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.032+02:00", comments="Source Table: threshold") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.032+02:00", comments="Source Table: threshold") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.032+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ThresholdRecordMapper { }) ThresholdRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.032+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -68,22 +68,22 @@ public interface ThresholdRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.032+02:00", comments="Source Table: threshold") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.032+02:00", comments="Source Table: threshold") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord) .where(id, isEqualTo(id_)) @@ -91,7 +91,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default int insert(ThresholdRecord record) { return insert(SqlBuilder.insert(record) .into(thresholdRecord) @@ -103,7 +103,7 @@ public interface ThresholdRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default int insertSelective(ThresholdRecord record) { return insert(SqlBuilder.insert(record) .into(thresholdRecord) @@ -115,19 +115,19 @@ public interface ThresholdRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, indicatorId, value, color, icon) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.439+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, indicatorId, value, color, icon) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default ThresholdRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, indicatorId, value, color, icon) .from(thresholdRecord) @@ -136,7 +136,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default UpdateDSL> updateByExample(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalTo(record::getIndicatorId) @@ -145,7 +145,7 @@ public interface ThresholdRecordMapper { .set(icon).equalTo(record::getIcon); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default UpdateDSL> updateByExampleSelective(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalToWhenPresent(record::getIndicatorId) @@ -154,7 +154,7 @@ public interface ThresholdRecordMapper { .set(icon).equalToWhenPresent(record::getIcon); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default int updateByPrimaryKey(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalTo(record::getIndicatorId) @@ -166,7 +166,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.033+02:00", comments="Source Table: threshold") default int updateByPrimaryKeySelective(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalToWhenPresent(record::getIndicatorId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java index e187062a..0a97c1f9 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java @@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class UserActivityLogRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.460+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.058+02:00", comments="Source Table: user_activity_log") public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.460+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.058+02:00", comments="Source field: user_activity_log.id") public static final SqlColumn id = userActivityLogRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.460+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.058+02:00", comments="Source field: user_activity_log.user_uuid") public static final SqlColumn userUuid = userActivityLogRecord.userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.460+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.058+02:00", comments="Source field: user_activity_log.timestamp") public static final SqlColumn timestamp = userActivityLogRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.058+02:00", comments="Source field: user_activity_log.activity_type") public static final SqlColumn activityType = userActivityLogRecord.activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.058+02:00", comments="Source field: user_activity_log.entity_type") public static final SqlColumn entityType = userActivityLogRecord.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.058+02:00", comments="Source field: user_activity_log.entity_id") public static final SqlColumn entityId = userActivityLogRecord.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source field: user_activity_log.message") public static final SqlColumn message = userActivityLogRecord.message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.460+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.058+02:00", comments="Source Table: user_activity_log") public static final class UserActivityLogRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java index ff1f35f8..25ffbfa7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface UserActivityLogRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface UserActivityLogRecordMapper { }) UserActivityLogRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface UserActivityLogRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default int insert(UserActivityLogRecord record) { return insert(SqlBuilder.insert(record) .into(userActivityLogRecord) @@ -108,7 +108,7 @@ public interface UserActivityLogRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.461+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default int insertSelective(UserActivityLogRecord record) { return insert(SqlBuilder.insert(record) .into(userActivityLogRecord) @@ -122,19 +122,19 @@ public interface UserActivityLogRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.462+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.462+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.462+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default UserActivityLogRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord) @@ -143,7 +143,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.462+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default UpdateDSL> updateByExample(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalTo(record::getUserUuid) @@ -154,7 +154,7 @@ public interface UserActivityLogRecordMapper { .set(message).equalTo(record::getMessage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.462+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default UpdateDSL> updateByExampleSelective(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalToWhenPresent(record::getUserUuid) @@ -165,7 +165,7 @@ public interface UserActivityLogRecordMapper { .set(message).equalToWhenPresent(record::getMessage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.462+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.059+02:00", comments="Source Table: user_activity_log") default int updateByPrimaryKey(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalTo(record::getUserUuid) @@ -179,7 +179,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.462+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.060+02:00", comments="Source Table: user_activity_log") default int updateByPrimaryKeySelective(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalToWhenPresent(record::getUserUuid) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java index a49f56a4..41f85eed 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java @@ -7,46 +7,46 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class UserRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.455+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.052+02:00", comments="Source Table: user") public static final UserRecord userRecord = new UserRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.455+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.052+02:00", comments="Source field: user.id") public static final SqlColumn id = userRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.455+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.052+02:00", comments="Source field: user.institution_id") public static final SqlColumn institutionId = userRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.455+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.052+02:00", comments="Source field: user.uuid") public static final SqlColumn uuid = userRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.455+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.052+02:00", comments="Source field: user.creation_date") public static final SqlColumn creationDate = userRecord.creationDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.455+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.052+02:00", comments="Source field: user.name") public static final SqlColumn name = userRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.455+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.052+02:00", comments="Source field: user.surname") public static final SqlColumn surname = userRecord.surname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.052+02:00", comments="Source field: user.username") public static final SqlColumn username = userRecord.username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source field: user.password") public static final SqlColumn password = userRecord.password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source field: user.email") public static final SqlColumn email = userRecord.email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source field: user.language") public static final SqlColumn language = userRecord.language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source field: user.timezone") public static final SqlColumn timezone = userRecord.timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source field: user.active") public static final SqlColumn active = userRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.455+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.052+02:00", comments="Source Table: user") public static final class UserRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java index 135dc716..c2aca467 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface UserRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,7 +65,7 @@ public interface UserRecordMapper { }) UserRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -83,22 +83,22 @@ public interface UserRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord) .where(id, isEqualTo(id_)) @@ -106,7 +106,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.456+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") default int insert(UserRecord record) { return insert(SqlBuilder.insert(record) .into(userRecord) @@ -125,7 +125,7 @@ public interface UserRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.457+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.053+02:00", comments="Source Table: user") default int insertSelective(UserRecord record) { return insert(SqlBuilder.insert(record) .into(userRecord) @@ -144,19 +144,19 @@ public interface UserRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.457+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.054+02:00", comments="Source Table: user") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, creationDate, name, surname, username, password, email, language, timezone, active) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.457+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.054+02:00", comments="Source Table: user") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, creationDate, name, surname, username, password, email, language, timezone, active) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.457+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.054+02:00", comments="Source Table: user") default UserRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, creationDate, name, surname, username, password, email, language, timezone, active) .from(userRecord) @@ -165,7 +165,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.457+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.054+02:00", comments="Source Table: user") default UpdateDSL> updateByExample(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -181,7 +181,7 @@ public interface UserRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.457+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.054+02:00", comments="Source Table: user") default UpdateDSL> updateByExampleSelective(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -197,7 +197,7 @@ public interface UserRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.457+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.054+02:00", comments="Source Table: user") default int updateByPrimaryKey(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -216,7 +216,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.457+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.054+02:00", comments="Source Table: user") default int updateByPrimaryKeySelective(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java index 5be7e9cd..cde1c35b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java @@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ViewRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.366+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.940+02:00", comments="Source Table: view") public static final ViewRecord viewRecord = new ViewRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.367+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.940+02:00", comments="Source field: view.id") public static final SqlColumn id = viewRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.367+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.941+02:00", comments="Source field: view.name") public static final SqlColumn name = viewRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.367+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.941+02:00", comments="Source field: view.columns") public static final SqlColumn columns = viewRecord.columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.367+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.941+02:00", comments="Source field: view.position") public static final SqlColumn position = viewRecord.position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.369+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.941+02:00", comments="Source field: view.template_id") public static final SqlColumn templateId = viewRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.367+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.940+02:00", comments="Source Table: view") public static final class ViewRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java index 40fa9c59..fdd54246 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ViewRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.369+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.941+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.369+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.942+02:00", comments="Source Table: view") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.369+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.942+02:00", comments="Source Table: view") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.369+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.942+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface ViewRecordMapper { }) ViewRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.369+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.942+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface ViewRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.369+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.942+02:00", comments="Source Table: view") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.369+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.942+02:00", comments="Source Table: view") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.370+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.943+02:00", comments="Source Table: view") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.370+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.943+02:00", comments="Source Table: view") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.370+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.943+02:00", comments="Source Table: view") default int insert(ViewRecord record) { return insert(SqlBuilder.insert(record) .into(viewRecord) @@ -102,7 +102,7 @@ public interface ViewRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.370+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.943+02:00", comments="Source Table: view") default int insertSelective(ViewRecord record) { return insert(SqlBuilder.insert(record) .into(viewRecord) @@ -114,19 +114,19 @@ public interface ViewRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.370+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.943+02:00", comments="Source Table: view") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, columns, position, templateId) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.370+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.943+02:00", comments="Source Table: view") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, columns, position, templateId) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.370+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.943+02:00", comments="Source Table: view") default ViewRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, columns, position, templateId) .from(viewRecord) @@ -135,7 +135,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.371+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.943+02:00", comments="Source Table: view") default UpdateDSL> updateByExample(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalTo(record::getName) @@ -144,7 +144,7 @@ public interface ViewRecordMapper { .set(templateId).equalTo(record::getTemplateId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.371+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.943+02:00", comments="Source Table: view") default UpdateDSL> updateByExampleSelective(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalToWhenPresent(record::getName) @@ -153,7 +153,7 @@ public interface ViewRecordMapper { .set(templateId).equalToWhenPresent(record::getTemplateId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.371+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.944+02:00", comments="Source Table: view") default int updateByPrimaryKey(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalTo(record::getName) @@ -165,7 +165,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.371+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.944+02:00", comments="Source Table: view") default int updateByPrimaryKeySelective(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java index c0caf305..2e1ffca5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java @@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class WebserviceServerInfoRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.466+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.067+02:00", comments="Source Table: webservice_server_info") public static final WebserviceServerInfoRecord webserviceServerInfoRecord = new WebserviceServerInfoRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.466+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.067+02:00", comments="Source field: webservice_server_info.id") public static final SqlColumn id = webserviceServerInfoRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.466+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.067+02:00", comments="Source field: webservice_server_info.uuid") public static final SqlColumn uuid = webserviceServerInfoRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.466+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.067+02:00", comments="Source field: webservice_server_info.service_address") public static final SqlColumn serviceAddress = webserviceServerInfoRecord.serviceAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.466+02:00", comments="Source field: webservice_server_info.master") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.067+02:00", comments="Source field: webservice_server_info.master") public static final SqlColumn master = webserviceServerInfoRecord.master; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.466+02:00", comments="Source field: webservice_server_info.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.067+02:00", comments="Source field: webservice_server_info.update_time") public static final SqlColumn updateTime = webserviceServerInfoRecord.updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.466+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.067+02:00", comments="Source Table: webservice_server_info") public static final class WebserviceServerInfoRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java index a9d3c1c5..33c7ee07 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface WebserviceServerInfoRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.466+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.067+02:00", comments="Source Table: webservice_server_info") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.466+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.467+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.467+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface WebserviceServerInfoRecordMapper { }) WebserviceServerInfoRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.467+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface WebserviceServerInfoRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.467+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.467+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.467+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.467+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface WebserviceServerInfoRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.467+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default int insert(WebserviceServerInfoRecord record) { return insert(SqlBuilder.insert(record) .into(webserviceServerInfoRecord) @@ -102,7 +102,7 @@ public interface WebserviceServerInfoRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default int insertSelective(WebserviceServerInfoRecord record) { return insert(SqlBuilder.insert(record) .into(webserviceServerInfoRecord) @@ -114,19 +114,19 @@ public interface WebserviceServerInfoRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, uuid, serviceAddress, master, updateTime) .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, uuid, serviceAddress, master, updateTime) .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default WebserviceServerInfoRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, uuid, serviceAddress, master, updateTime) .from(webserviceServerInfoRecord) @@ -135,7 +135,7 @@ public interface WebserviceServerInfoRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default UpdateDSL> updateByExample(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalTo(record::getUuid) @@ -144,7 +144,7 @@ public interface WebserviceServerInfoRecordMapper { .set(updateTime).equalTo(record::getUpdateTime); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default UpdateDSL> updateByExampleSelective(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalToWhenPresent(record::getUuid) @@ -153,7 +153,7 @@ public interface WebserviceServerInfoRecordMapper { .set(updateTime).equalToWhenPresent(record::getUpdateTime); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.068+02:00", comments="Source Table: webservice_server_info") default int updateByPrimaryKey(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalTo(record::getUuid) @@ -165,7 +165,7 @@ public interface WebserviceServerInfoRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.069+02:00", comments="Source Table: webservice_server_info") default int updateByPrimaryKeySelective(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalToWhenPresent(record::getUuid) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java index 782b0cda..cce15440 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java @@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class AdditionalAttributeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.462+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.062+02:00", comments="Source field: additional_attributes.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.062+02:00", comments="Source field: additional_attributes.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source field: additional_attributes.entity_id") private Long entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source field: additional_attributes.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source field: additional_attributes.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.462+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.062+02:00", comments="Source Table: additional_attributes") public AdditionalAttributeRecord(Long id, String entityType, Long entityId, String name, String value) { this.id = id; this.entityType = entityType; @@ -27,27 +27,27 @@ public class AdditionalAttributeRecord { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.062+02:00", comments="Source field: additional_attributes.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source field: additional_attributes.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source field: additional_attributes.entity_id") public Long getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source field: additional_attributes.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.463+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.063+02:00", comments="Source field: additional_attributes.value") public String getValue() { return value; } @@ -56,7 +56,7 @@ public class AdditionalAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class AdditionalAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class AdditionalAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/BatchActionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/BatchActionRecord.java index 249187d4..eee25cd3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/BatchActionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/BatchActionRecord.java @@ -3,34 +3,38 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class BatchActionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.action_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.owner") + private String owner; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.action_type") private String actionType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.attributes") private String attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.source_ids") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.source_ids") private String sourceIds; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.successful") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.successful") private String successful; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.last_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.last_update") private Long lastUpdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.processor_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.processor_id") private String processorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source Table: batch_action") - public BatchActionRecord(Long id, Long institutionId, String actionType, String attributes, String sourceIds, String successful, Long lastUpdate, String processorId) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source Table: batch_action") + public BatchActionRecord(Long id, Long institutionId, String owner, String actionType, String attributes, String sourceIds, String successful, Long lastUpdate, String processorId) { this.id = id; this.institutionId = institutionId; + this.owner = owner; this.actionType = actionType; this.attributes = attributes; this.sourceIds = sourceIds; @@ -39,42 +43,47 @@ public class BatchActionRecord { this.processorId = processorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.action_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.owner") + public String getOwner() { + return owner; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.action_type") public String getActionType() { return actionType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.attributes") public String getAttributes() { return attributes; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.source_ids") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.source_ids") public String getSourceIds() { return sourceIds; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.successful") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.successful") public String getSuccessful() { return successful; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.473+02:00", comments="Source field: batch_action.last_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.last_update") public Long getLastUpdate() { return lastUpdate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.474+02:00", comments="Source field: batch_action.processor_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.075+02:00", comments="Source field: batch_action.processor_id") public String getProcessorId() { return processorId; } @@ -83,7 +92,7 @@ public class BatchActionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table batch_action * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -93,6 +102,7 @@ public class BatchActionRecord { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", institutionId=").append(institutionId); + sb.append(", owner=").append(owner); sb.append(", actionType=").append(actionType); sb.append(", attributes=").append(attributes); sb.append(", sourceIds=").append(sourceIds); @@ -107,7 +117,7 @@ public class BatchActionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table batch_action * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -123,6 +133,7 @@ public class BatchActionRecord { BatchActionRecord other = (BatchActionRecord) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getInstitutionId() == null ? other.getInstitutionId() == null : this.getInstitutionId().equals(other.getInstitutionId())) + && (this.getOwner() == null ? other.getOwner() == null : this.getOwner().equals(other.getOwner())) && (this.getActionType() == null ? other.getActionType() == null : this.getActionType().equals(other.getActionType())) && (this.getAttributes() == null ? other.getAttributes() == null : this.getAttributes().equals(other.getAttributes())) && (this.getSourceIds() == null ? other.getSourceIds() == null : this.getSourceIds().equals(other.getSourceIds())) @@ -135,7 +146,7 @@ public class BatchActionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table batch_action * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { @@ -143,6 +154,7 @@ public class BatchActionRecord { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getInstitutionId() == null) ? 0 : getInstitutionId().hashCode()); + result = prime * result + ((getOwner() == null) ? 0 : getOwner().hashCode()); result = prime * result + ((getActionType() == null) ? 0 : getActionType().hashCode()); result = prime * result + ((getAttributes() == null) ? 0 : getAttributes().hashCode()); result = prime * result + ((getSourceIds() == null) ? 0 : getSourceIds().hashCode()); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/CertificateRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/CertificateRecord.java index 4b535f42..3d5480ac 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/CertificateRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/CertificateRecord.java @@ -4,19 +4,19 @@ import java.util.Arrays; import javax.annotation.Generated; public class CertificateRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source field: certificate.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.069+02:00", comments="Source field: certificate.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source field: certificate.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.069+02:00", comments="Source field: certificate.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source field: certificate.aliases") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.069+02:00", comments="Source field: certificate.aliases") private String aliases; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source field: certificate.cert_store") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.069+02:00", comments="Source field: certificate.cert_store") private byte[] certStore; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.069+02:00", comments="Source Table: certificate") public CertificateRecord(Long id, Long institutionId, String aliases, byte[] certStore) { this.id = id; this.institutionId = institutionId; @@ -24,22 +24,22 @@ public class CertificateRecord { this.certStore = certStore; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.468+02:00", comments="Source field: certificate.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.069+02:00", comments="Source field: certificate.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source field: certificate.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.069+02:00", comments="Source field: certificate.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source field: certificate.aliases") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.069+02:00", comments="Source field: certificate.aliases") public String getAliases() { return aliases; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.469+02:00", comments="Source field: certificate.cert_store") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.070+02:00", comments="Source field: certificate.cert_store") public byte[] getCertStore() { return certStore; } @@ -48,7 +48,7 @@ public class CertificateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table certificate * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -68,7 +68,7 @@ public class CertificateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table certificate * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -92,7 +92,7 @@ public class CertificateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table certificate * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java index b4c35176..ec1220ec 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java @@ -3,58 +3,58 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientConnectionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.403+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.404+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.404+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.404+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.404+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.405+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.exam_user_session_id") private String examUserSessionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.405+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.994+02:00", comments="Source field: client_connection.client_address") private String clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.405+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.994+02:00", comments="Source field: client_connection.virtual_client_address") private String virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.994+02:00", comments="Source field: client_connection.vdi") private Integer vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.vdi_pair_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.vdi_pair_token") private String vdiPairToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.creation_time") private Long creationTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.update_time") private Long updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.remote_proctoring_room_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.remote_proctoring_room_id") private Long remoteProctoringRoomId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.remote_proctoring_room_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.remote_proctoring_room_update") private Integer remoteProctoringRoomUpdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.client_machine_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.client_machine_name") private String clientMachineName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.client_os_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.client_os_name") private String clientOsName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.client_version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.client_version") private String clientVersion; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.403+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source Table: client_connection") public ClientConnectionRecord(Long id, Long institutionId, Long examId, String status, String connectionToken, String examUserSessionId, String clientAddress, String virtualClientAddress, Integer vdi, String vdiPairToken, Long creationTime, Long updateTime, Long remoteProctoringRoomId, Integer remoteProctoringRoomUpdate, String clientMachineName, String clientOsName, String clientVersion) { this.id = id; this.institutionId = institutionId; @@ -75,87 +75,87 @@ public class ClientConnectionRecord { this.clientVersion = clientVersion; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.404+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.404+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.404+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.404+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.404+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.993+02:00", comments="Source field: client_connection.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.405+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.994+02:00", comments="Source field: client_connection.exam_user_session_id") public String getExamUserSessionId() { return examUserSessionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.405+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.994+02:00", comments="Source field: client_connection.client_address") public String getClientAddress() { return clientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.405+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.994+02:00", comments="Source field: client_connection.virtual_client_address") public String getVirtualClientAddress() { return virtualClientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.994+02:00", comments="Source field: client_connection.vdi") public Integer getVdi() { return vdi; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.vdi_pair_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.vdi_pair_token") public String getVdiPairToken() { return vdiPairToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.creation_time") public Long getCreationTime() { return creationTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.update_time") public Long getUpdateTime() { return updateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.remote_proctoring_room_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.remote_proctoring_room_id") public Long getRemoteProctoringRoomId() { return remoteProctoringRoomId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.remote_proctoring_room_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.remote_proctoring_room_update") public Integer getRemoteProctoringRoomUpdate() { return remoteProctoringRoomUpdate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.client_machine_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.client_machine_name") public String getClientMachineName() { return clientMachineName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.client_os_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.995+02:00", comments="Source field: client_connection.client_os_name") public String getClientOsName() { return clientOsName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.406+02:00", comments="Source field: client_connection.client_version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.996+02:00", comments="Source field: client_connection.client_version") public String getClientVersion() { return clientVersion; } @@ -164,7 +164,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public String toString() { @@ -197,7 +197,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public boolean equals(Object that) { @@ -234,7 +234,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java index b52b479f..a49f16c6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java @@ -4,28 +4,28 @@ import java.math.BigDecimal; import javax.annotation.Generated; public class ClientEventRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.417+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.009+02:00", comments="Source field: client_event.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.client_connection_id") private Long clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.client_time") private Long clientTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.server_time") private Long serverTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.numeric_value") private BigDecimal numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.417+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.009+02:00", comments="Source Table: client_event") public ClientEventRecord(Long id, Long clientConnectionId, Integer type, Long clientTime, Long serverTime, BigDecimal numericValue, String text) { this.id = id; this.clientConnectionId = clientConnectionId; @@ -36,77 +36,77 @@ public class ClientEventRecord { this.text = text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.417+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.009+02:00", comments="Source Table: client_event") public ClientEventRecord() { super(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.id") public void setId(Long id) { this.id = id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.client_connection_id") public Long getClientConnectionId() { return clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.client_connection_id") public void setClientConnectionId(Long clientConnectionId) { this.clientConnectionId = clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.type") public void setType(Integer type) { this.type = type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.client_time") public Long getClientTime() { return clientTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.client_time") public void setClientTime(Long clientTime) { this.clientTime = clientTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.server_time") public Long getServerTime() { return serverTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.server_time") public void setServerTime(Long serverTime) { this.serverTime = serverTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.numeric_value") public BigDecimal getNumericValue() { return numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.418+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.numeric_value") public void setNumericValue(BigDecimal numericValue) { this.numericValue = numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.419+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.text") public String getText() { return text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.419+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.010+02:00", comments="Source field: client_event.text") public void setText(String text) { this.text = text == null ? null : text.trim(); } @@ -115,7 +115,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -138,7 +138,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -165,7 +165,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientIndicatorRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientIndicatorRecord.java index 9962342b..3e6babcf 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientIndicatorRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientIndicatorRecord.java @@ -3,19 +3,19 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientIndicatorRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.078+02:00", comments="Source field: client_indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.078+02:00", comments="Source field: client_indicator.client_connection_id") private Long clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.078+02:00", comments="Source field: client_indicator.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source field: client_indicator.value") private Long value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.078+02:00", comments="Source Table: client_indicator") public ClientIndicatorRecord(Long id, Long clientConnectionId, Integer type, Long value) { this.id = id; this.clientConnectionId = clientConnectionId; @@ -23,47 +23,47 @@ public class ClientIndicatorRecord { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.078+02:00", comments="Source Table: client_indicator") public ClientIndicatorRecord() { super(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.078+02:00", comments="Source field: client_indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.078+02:00", comments="Source field: client_indicator.id") public void setId(Long id) { this.id = id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.078+02:00", comments="Source field: client_indicator.client_connection_id") public Long getClientConnectionId() { return clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.078+02:00", comments="Source field: client_indicator.client_connection_id") public void setClientConnectionId(Long clientConnectionId) { this.clientConnectionId = clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.078+02:00", comments="Source field: client_indicator.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.476+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source field: client_indicator.type") public void setType(Integer type) { this.type = type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source field: client_indicator.value") public Long getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.477+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.079+02:00", comments="Source field: client_indicator.value") public void setValue(Long value) { this.value = value; } @@ -72,7 +72,7 @@ public class ClientIndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_indicator * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -92,7 +92,7 @@ public class ClientIndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_indicator * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -116,7 +116,7 @@ public class ClientIndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_indicator * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java index 25e2c0da..1c6e613b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java @@ -3,28 +3,28 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientInstructionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.014+02:00", comments="Source field: client_instruction.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.014+02:00", comments="Source field: client_instruction.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.014+02:00", comments="Source field: client_instruction.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.015+02:00", comments="Source field: client_instruction.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.015+02:00", comments="Source field: client_instruction.attributes") private String attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.needs_confirmation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.015+02:00", comments="Source field: client_instruction.needs_confirmation") private Integer needsConfirmation; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.015+02:00", comments="Source field: client_instruction.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.014+02:00", comments="Source Table: client_instruction") public ClientInstructionRecord(Long id, Long examId, String connectionToken, String type, String attributes, Integer needsConfirmation, Long timestamp) { this.id = id; this.examId = examId; @@ -35,37 +35,37 @@ public class ClientInstructionRecord { this.timestamp = timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.014+02:00", comments="Source field: client_instruction.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.014+02:00", comments="Source field: client_instruction.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.014+02:00", comments="Source field: client_instruction.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.015+02:00", comments="Source field: client_instruction.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.015+02:00", comments="Source field: client_instruction.attributes") public String getAttributes() { return attributes; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.needs_confirmation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.015+02:00", comments="Source field: client_instruction.needs_confirmation") public Integer getNeedsConfirmation() { return needsConfirmation; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.423+02:00", comments="Source field: client_instruction.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.015+02:00", comments="Source field: client_instruction.timestamp") public Long getTimestamp() { return timestamp; } @@ -74,7 +74,7 @@ public class ClientInstructionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_instruction * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -97,7 +97,7 @@ public class ClientInstructionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_instruction * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -124,7 +124,7 @@ public class ClientInstructionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_instruction * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientNotificationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientNotificationRecord.java index e2b2d863..9c0039d5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientNotificationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientNotificationRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientNotificationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.478+02:00", comments="Source field: client_notification.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.client_connection_id") private Long clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.event_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.event_type") private Integer eventType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.notification_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.notification_type") private Integer notificationType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.value") private Long value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.478+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source Table: client_notification") public ClientNotificationRecord(Long id, Long clientConnectionId, Integer eventType, Integer notificationType, Long value, String text) { this.id = id; this.clientConnectionId = clientConnectionId; @@ -31,32 +31,32 @@ public class ClientNotificationRecord { this.text = text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.client_connection_id") public Long getClientConnectionId() { return clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.event_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.event_type") public Integer getEventType() { return eventType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.notification_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.notification_type") public Integer getNotificationType() { return notificationType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.082+02:00", comments="Source field: client_notification.value") public Long getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.479+02:00", comments="Source field: client_notification.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.083+02:00", comments="Source field: client_notification.text") public String getText() { return text; } @@ -65,7 +65,7 @@ public class ClientNotificationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_notification * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ClientNotificationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_notification * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ClientNotificationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_notification * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java index 1c6202b7..26ce1dc0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java @@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ConfigurationAttributeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.107+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.764+02:00", comments="Source field: configuration_attribute.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.108+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.764+02:00", comments="Source field: configuration_attribute.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.108+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.764+02:00", comments="Source field: configuration_attribute.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.108+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.764+02:00", comments="Source field: configuration_attribute.parent_id") private Long parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.108+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.764+02:00", comments="Source field: configuration_attribute.resources") private String resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.108+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.765+02:00", comments="Source field: configuration_attribute.validator") private String validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.109+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.765+02:00", comments="Source field: configuration_attribute.dependencies") private String dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.109+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.765+02:00", comments="Source field: configuration_attribute.default_value") private String defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.101+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.760+02:00", comments="Source Table: configuration_attribute") public ConfigurationAttributeRecord(Long id, String name, String type, Long parentId, String resources, String validator, String dependencies, String defaultValue) { this.id = id; this.name = name; @@ -39,42 +39,42 @@ public class ConfigurationAttributeRecord { this.defaultValue = defaultValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.107+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.764+02:00", comments="Source field: configuration_attribute.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.108+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.764+02:00", comments="Source field: configuration_attribute.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.108+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.764+02:00", comments="Source field: configuration_attribute.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.108+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.764+02:00", comments="Source field: configuration_attribute.parent_id") public Long getParentId() { return parentId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.108+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.764+02:00", comments="Source field: configuration_attribute.resources") public String getResources() { return resources; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.108+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.765+02:00", comments="Source field: configuration_attribute.validator") public String getValidator() { return validator; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.109+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.765+02:00", comments="Source field: configuration_attribute.dependencies") public String getDependencies() { return dependencies; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.109+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.765+02:00", comments="Source field: configuration_attribute.default_value") public String getDefaultValue() { return defaultValue; } @@ -83,7 +83,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java index 47b9c2f3..4190b448 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java @@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ConfigurationNodeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.962+02:00", comments="Source field: configuration_node.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.962+02:00", comments="Source field: configuration_node.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.963+02:00", comments="Source field: configuration_node.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.963+02:00", comments="Source field: configuration_node.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.963+02:00", comments="Source field: configuration_node.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.963+02:00", comments="Source field: configuration_node.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.388+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.963+02:00", comments="Source field: configuration_node.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.388+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.964+02:00", comments="Source field: configuration_node.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.386+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.962+02:00", comments="Source Table: configuration_node") public ConfigurationNodeRecord(Long id, Long institutionId, Long templateId, String owner, String name, String description, String type, String status) { this.id = id; this.institutionId = institutionId; @@ -39,42 +39,42 @@ public class ConfigurationNodeRecord { this.status = status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.962+02:00", comments="Source field: configuration_node.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.962+02:00", comments="Source field: configuration_node.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.963+02:00", comments="Source field: configuration_node.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.963+02:00", comments="Source field: configuration_node.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.963+02:00", comments="Source field: configuration_node.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.387+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.963+02:00", comments="Source field: configuration_node.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.388+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.963+02:00", comments="Source field: configuration_node.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.388+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.964+02:00", comments="Source field: configuration_node.status") public String getStatus() { return status; } @@ -83,7 +83,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java index 7730987d..a7953547 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java @@ -4,25 +4,25 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class ConfigurationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.954+02:00", comments="Source field: configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.957+02:00", comments="Source field: configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.957+02:00", comments="Source field: configuration.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.957+02:00", comments="Source field: configuration.version") private String version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.957+02:00", comments="Source field: configuration.version_date") private DateTime versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.384+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.957+02:00", comments="Source field: configuration.followup") private Integer followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.954+02:00", comments="Source Table: configuration") public ConfigurationRecord(Long id, Long institutionId, Long configurationNodeId, String version, DateTime versionDate, Integer followup) { this.id = id; this.institutionId = institutionId; @@ -32,32 +32,32 @@ public class ConfigurationRecord { this.followup = followup; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.956+02:00", comments="Source field: configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.957+02:00", comments="Source field: configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.957+02:00", comments="Source field: configuration.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.957+02:00", comments="Source field: configuration.version") public String getVersion() { return version; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.383+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.957+02:00", comments="Source field: configuration.version_date") public DateTime getVersionDate() { return versionDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.384+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.958+02:00", comments="Source field: configuration.followup") public Integer getFollowup() { return followup; } @@ -66,7 +66,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public String toString() { @@ -88,7 +88,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public boolean equals(Object that) { @@ -114,7 +114,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java index 18e22f76..f88ca811 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ConfigurationValueRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.348+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.configuration_id") private Long configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.configuration_attribute_id") private Long configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.list_index") private Integer listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.348+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source Table: configuration_value") public ConfigurationValueRecord(Long id, Long institutionId, Long configurationId, Long configurationAttributeId, Integer listIndex, String value) { this.id = id; this.institutionId = institutionId; @@ -31,32 +31,32 @@ public class ConfigurationValueRecord { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.configuration_id") public Long getConfigurationId() { return configurationId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.configuration_attribute_id") public Long getConfigurationAttributeId() { return configurationAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.list_index") public Integer getListIndex() { return listIndex; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.349+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.933+02:00", comments="Source field: configuration_value.value") public String getValue() { return value; } @@ -65,7 +65,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java index 9434541c..d29d684c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamConfigurationMapRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.970+02:00", comments="Source field: exam_configuration_map.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.970+02:00", comments="Source field: exam_configuration_map.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.970+02:00", comments="Source field: exam_configuration_map.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.973+02:00", comments="Source field: exam_configuration_map.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.973+02:00", comments="Source field: exam_configuration_map.user_names") private String userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.974+02:00", comments="Source field: exam_configuration_map.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.970+02:00", comments="Source Table: exam_configuration_map") public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String userNames, String encryptSecret) { this.id = id; this.institutionId = institutionId; @@ -31,32 +31,32 @@ public class ExamConfigurationMapRecord { this.encryptSecret = encryptSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.970+02:00", comments="Source field: exam_configuration_map.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.970+02:00", comments="Source field: exam_configuration_map.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.970+02:00", comments="Source field: exam_configuration_map.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.973+02:00", comments="Source field: exam_configuration_map.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.974+02:00", comments="Source field: exam_configuration_map.user_names") public String getUserNames() { return userNames; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.393+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.974+02:00", comments="Source field: exam_configuration_map.encrypt_secret") public String getEncryptSecret() { return encryptSecret; } @@ -65,7 +65,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java index cc441132..61233b11 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java @@ -3,55 +3,55 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.978+02:00", comments="Source field: exam.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.978+02:00", comments="Source field: exam.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.lms_setup_id") private Long lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.external_id") private String externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.quit_password") private String quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.browser_keys") private String browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.lms_seb_restriction") private Integer lmsSebRestriction; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.updating") private Integer updating; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.lastupdate") private String lastupdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.exam_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.exam_template_id") private Long examTemplateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.last_modified") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.last_modified") private Long lastModified; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.396+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.978+02:00", comments="Source Table: exam") public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String quitPassword, String browserKeys, String status, Integer lmsSebRestriction, Integer updating, String lastupdate, Integer active, Long examTemplateId, Long lastModified) { this.id = id; this.institutionId = institutionId; @@ -71,82 +71,82 @@ public class ExamRecord { this.lastModified = lastModified; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.978+02:00", comments="Source field: exam.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.lms_setup_id") public Long getLmsSetupId() { return lmsSetupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.external_id") public String getExternalId() { return externalId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.397+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.quit_password") public String getQuitPassword() { return quitPassword; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.979+02:00", comments="Source field: exam.browser_keys") public String getBrowserKeys() { return browserKeys; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.lms_seb_restriction") public Integer getLmsSebRestriction() { return lmsSebRestriction; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.updating") public Integer getUpdating() { return updating; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.lastupdate") public String getLastupdate() { return lastupdate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.exam_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.980+02:00", comments="Source field: exam.exam_template_id") public Long getExamTemplateId() { return examTemplateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.398+02:00", comments="Source field: exam.last_modified") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.982+02:00", comments="Source field: exam.last_modified") public Long getLastModified() { return lastModified; } @@ -155,7 +155,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public String toString() { @@ -187,7 +187,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public boolean equals(Object that) { @@ -223,7 +223,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamTemplateRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamTemplateRecord.java index e2f89833..2ecd80a9 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamTemplateRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamTemplateRecord.java @@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamTemplateRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.configuration_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.configuration_template_id") private Long configurationTemplateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.exam_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.exam_type") private String examType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.indicator_templates") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.indicator_templates") private String indicatorTemplates; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.institutional_default") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.institutional_default") private Integer institutionalDefault; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source Table: exam_template") public ExamTemplateRecord(Long id, Long institutionId, Long configurationTemplateId, String name, String description, String examType, String supporter, String indicatorTemplates, Integer institutionalDefault) { this.id = id; this.institutionId = institutionId; @@ -43,47 +43,47 @@ public class ExamTemplateRecord { this.institutionalDefault = institutionalDefault; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.configuration_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.configuration_template_id") public Long getConfigurationTemplateId() { return configurationTemplateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.exam_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.exam_type") public String getExamType() { return examType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.072+02:00", comments="Source field: exam_template.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.indicator_templates") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.indicator_templates") public String getIndicatorTemplates() { return indicatorTemplates; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.471+02:00", comments="Source field: exam_template.institutional_default") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.073+02:00", comments="Source field: exam_template.institutional_default") public Integer getInstitutionalDefault() { return institutionalDefault; } @@ -92,7 +92,7 @@ public class ExamTemplateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_template * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class ExamTemplateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_template * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class ExamTemplateRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_template * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java index ded143f9..2f330366 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java @@ -3,28 +3,28 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class IndicatorRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.433+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.icon") private String icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.tags") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.026+02:00", comments="Source field: indicator.tags") private String tags; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.433+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source Table: indicator") public IndicatorRecord(Long id, Long examId, String type, String name, String color, String icon, String tags) { this.id = id; this.examId = examId; @@ -35,37 +35,37 @@ public class IndicatorRecord { this.tags = tags; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.433+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.color") public String getColor() { return color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.025+02:00", comments="Source field: indicator.icon") public String getIcon() { return icon; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.434+02:00", comments="Source field: indicator.tags") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.026+02:00", comments="Source field: indicator.tags") public String getTags() { return tags; } @@ -74,7 +74,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -97,7 +97,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -124,7 +124,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java index cdb20659..e6786844 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class InstitutionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.url_suffix") private String urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.theme_name") private String themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.logo_image") private String logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source Table: institution") public InstitutionRecord(Long id, String name, String urlSuffix, String themeName, Integer active, String logoImage) { this.id = id; this.name = name; @@ -31,32 +31,32 @@ public class InstitutionRecord { this.logoImage = logoImage; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.url_suffix") public String getUrlSuffix() { return urlSuffix; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.theme_name") public String getThemeName() { return themeName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.440+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.441+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.034+02:00", comments="Source field: institution.logo_image") public String getLogoImage() { return logoImage; } @@ -65,7 +65,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java index e37d65b1..2204639e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java @@ -3,49 +3,49 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class LmsSetupRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_type") private String lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_url") private String lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_clientname") private String lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_clientsecret") private String lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_rest_api_token") private String lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_proxy_host") private String lmsProxyHost; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_proxy_port") private Integer lmsProxyPort; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") private String lmsProxyAuthUsername; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") private String lmsProxyAuthSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.update_time") private Long updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.449+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source Table: lms_setup") public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String lmsProxyHost, Integer lmsProxyPort, String lmsProxyAuthUsername, String lmsProxyAuthSecret, Long updateTime, Integer active) { this.id = id; this.institutionId = institutionId; @@ -63,72 +63,72 @@ public class LmsSetupRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_type") public String getLmsType() { return lmsType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_url") public String getLmsUrl() { return lmsUrl; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_clientname") public String getLmsClientname() { return lmsClientname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_clientsecret") public String getLmsClientsecret() { return lmsClientsecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_rest_api_token") public String getLmsRestApiToken() { return lmsRestApiToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_proxy_host") public String getLmsProxyHost() { return lmsProxyHost; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_proxy_port") public Integer getLmsProxyPort() { return lmsProxyPort; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.046+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") public String getLmsProxyAuthUsername() { return lmsProxyAuthUsername; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") public String getLmsProxyAuthSecret() { return lmsProxyAuthSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.update_time") public Long getUpdateTime() { return updateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.450+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.047+02:00", comments="Source field: lms_setup.active") public Integer getActive() { return active; } @@ -137,7 +137,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -167,7 +167,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -201,7 +201,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java index 0f314d7d..9a278fe6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java @@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class OrientationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.945+02:00", comments="Source field: orientation.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.945+02:00", comments="Source field: orientation.config_attribute_id") private Long configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.945+02:00", comments="Source field: orientation.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.946+02:00", comments="Source field: orientation.view_id") private Long viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.946+02:00", comments="Source field: orientation.group_id") private String groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.946+02:00", comments="Source field: orientation.x_position") private Integer xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.373+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.946+02:00", comments="Source field: orientation.y_position") private Integer yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.373+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.946+02:00", comments="Source field: orientation.width") private Integer width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.373+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.947+02:00", comments="Source field: orientation.height") private Integer height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.373+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.947+02:00", comments="Source field: orientation.title") private String title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.945+02:00", comments="Source Table: orientation") public OrientationRecord(Long id, Long configAttributeId, Long templateId, Long viewId, String groupId, Integer xPosition, Integer yPosition, Integer width, Integer height, String title) { this.id = id; this.configAttributeId = configAttributeId; @@ -47,52 +47,52 @@ public class OrientationRecord { this.title = title; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.945+02:00", comments="Source field: orientation.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.945+02:00", comments="Source field: orientation.config_attribute_id") public Long getConfigAttributeId() { return configAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.946+02:00", comments="Source field: orientation.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.946+02:00", comments="Source field: orientation.view_id") public Long getViewId() { return viewId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.372+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.946+02:00", comments="Source field: orientation.group_id") public String getGroupId() { return groupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.373+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.946+02:00", comments="Source field: orientation.x_position") public Integer getxPosition() { return xPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.373+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.946+02:00", comments="Source field: orientation.y_position") public Integer getyPosition() { return yPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.373+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.947+02:00", comments="Source field: orientation.width") public Integer getWidth() { return width; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.373+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.947+02:00", comments="Source field: orientation.height") public Integer getHeight() { return height; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.373+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.947+02:00", comments="Source field: orientation.title") public String getTitle() { return title; } @@ -101,7 +101,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java index e2c30705..fda54601 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java @@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class RemoteProctoringRoomRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.411+02:00", comments="Source field: remote_proctoring_room.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.004+02:00", comments="Source field: remote_proctoring_room.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.411+02:00", comments="Source field: remote_proctoring_room.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.004+02:00", comments="Source field: remote_proctoring_room.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.411+02:00", comments="Source field: remote_proctoring_room.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.size") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.size") private Integer size; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.subject") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.subject") private String subject; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.townhall_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.townhall_room") private Integer townhallRoom; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.break_out_connections") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.break_out_connections") private String breakOutConnections; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.join_key") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.join_key") private String joinKey; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.room_data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.room_data") private String roomData; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.411+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.004+02:00", comments="Source Table: remote_proctoring_room") public RemoteProctoringRoomRecord(Long id, Long examId, String name, Integer size, String subject, Integer townhallRoom, String breakOutConnections, String joinKey, String roomData) { this.id = id; this.examId = examId; @@ -43,47 +43,47 @@ public class RemoteProctoringRoomRecord { this.roomData = roomData; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.411+02:00", comments="Source field: remote_proctoring_room.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.004+02:00", comments="Source field: remote_proctoring_room.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.411+02:00", comments="Source field: remote_proctoring_room.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.004+02:00", comments="Source field: remote_proctoring_room.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.411+02:00", comments="Source field: remote_proctoring_room.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.size") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.size") public Integer getSize() { return size; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.subject") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.subject") public String getSubject() { return subject; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.townhall_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.townhall_room") public Integer getTownhallRoom() { return townhallRoom; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.break_out_connections") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.break_out_connections") public String getBreakOutConnections() { return breakOutConnections; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.join_key") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.005+02:00", comments="Source field: remote_proctoring_room.join_key") public String getJoinKey() { return joinKey; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.412+02:00", comments="Source field: remote_proctoring_room.room_data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.006+02:00", comments="Source field: remote_proctoring_room.room_data") public String getRoomData() { return roomData; } @@ -92,7 +92,7 @@ public class RemoteProctoringRoomRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table remote_proctoring_room * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class RemoteProctoringRoomRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table remote_proctoring_room * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class RemoteProctoringRoomRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table remote_proctoring_room * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java index c4619c1c..6b0f027f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java @@ -3,33 +3,33 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class RoleRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.055+02:00", comments="Source field: user_role.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.055+02:00", comments="Source field: user_role.user_id") private Long userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.055+02:00", comments="Source field: user_role.role_name") private String roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.054+02:00", comments="Source Table: user_role") public RoleRecord(Long id, Long userId, String roleName) { this.id = id; this.userId = userId; this.roleName = roleName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.055+02:00", comments="Source field: user_role.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.055+02:00", comments="Source field: user_role.user_id") public Long getUserId() { return userId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.458+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.055+02:00", comments="Source field: user_role.role_name") public String getRoleName() { return roleName; } @@ -38,7 +38,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -57,7 +57,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -80,7 +80,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java index c0226d4b..de7baed9 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java @@ -4,31 +4,31 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class SebClientConfigRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source field: seb_client_configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source field: seb_client_configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source field: seb_client_configuration.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source field: seb_client_configuration.date") private DateTime date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source field: seb_client_configuration.client_name") private String clientName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source field: seb_client_configuration.client_secret") private String clientSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source field: seb_client_configuration.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source field: seb_client_configuration.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source Table: seb_client_configuration") public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, String encryptSecret, Integer active) { this.id = id; this.institutionId = institutionId; @@ -40,42 +40,42 @@ public class SebClientConfigRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source field: seb_client_configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source field: seb_client_configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source field: seb_client_configuration.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source field: seb_client_configuration.date") public DateTime getDate() { return date; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.042+02:00", comments="Source field: seb_client_configuration.client_name") public String getClientName() { return clientName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source field: seb_client_configuration.client_secret") public String getClientSecret() { return clientSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.444+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source field: seb_client_configuration.encrypt_secret") public String getEncryptSecret() { return encryptSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.445+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.043+02:00", comments="Source field: seb_client_configuration.active") public Integer getActive() { return active; } @@ -84,7 +84,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -108,7 +108,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -136,7 +136,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java index 094f7ab7..ff82e2fc 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java @@ -4,22 +4,22 @@ import java.math.BigDecimal; import javax.annotation.Generated; public class ThresholdRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.030+02:00", comments="Source field: threshold.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.030+02:00", comments="Source field: threshold.indicator_id") private Long indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.030+02:00", comments="Source field: threshold.value") private BigDecimal value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.031+02:00", comments="Source field: threshold.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source field: threshold.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.031+02:00", comments="Source field: threshold.icon") private String icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.030+02:00", comments="Source Table: threshold") public ThresholdRecord(Long id, Long indicatorId, BigDecimal value, String color, String icon) { this.id = id; this.indicatorId = indicatorId; @@ -28,27 +28,27 @@ public class ThresholdRecord { this.icon = icon; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.030+02:00", comments="Source field: threshold.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.030+02:00", comments="Source field: threshold.indicator_id") public Long getIndicatorId() { return indicatorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.030+02:00", comments="Source field: threshold.value") public BigDecimal getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.031+02:00", comments="Source field: threshold.color") public String getColor() { return color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.437+02:00", comments="Source field: threshold.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.031+02:00", comments="Source field: threshold.icon") public String getIcon() { return icon; } @@ -57,7 +57,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -78,7 +78,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -103,7 +103,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java index 9879f535..c86cc297 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java @@ -3,28 +3,28 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class UserActivityLogRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.user_uuid") private String userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.activity_type") private String activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.entity_id") private String entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.message") private String message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source Table: user_activity_log") public UserActivityLogRecord(Long id, String userUuid, Long timestamp, String activityType, String entityType, String entityId, String message) { this.id = id; this.userUuid = userUuid; @@ -35,37 +35,37 @@ public class UserActivityLogRecord { this.message = message; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.user_uuid") public String getUserUuid() { return userUuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.activity_type") public String getActivityType() { return activityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.459+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.entity_id") public String getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.460+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.057+02:00", comments="Source field: user_activity_log.message") public String getMessage() { return message; } @@ -74,7 +74,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -97,7 +97,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -124,7 +124,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java index 1f4c2491..f5c27ac8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java @@ -4,43 +4,43 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class UserRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.050+02:00", comments="Source field: user.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.050+02:00", comments="Source field: user.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.creation_date") private DateTime creationDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.surname") private String surname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.username") private String username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.password") private String password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.email") private String email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.language") private String language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.timezone") private String timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.455+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.050+02:00", comments="Source Table: user") public UserRecord(Long id, Long institutionId, String uuid, DateTime creationDate, String name, String surname, String username, String password, String email, String language, String timezone, Integer active) { this.id = id; this.institutionId = institutionId; @@ -56,62 +56,62 @@ public class UserRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.050+02:00", comments="Source field: user.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.050+02:00", comments="Source field: user.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.creation_date") public DateTime getCreationDate() { return creationDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.surname") public String getSurname() { return surname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.username") public String getUsername() { return username; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.password") public String getPassword() { return password; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.email") public String getEmail() { return email; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.language") public String getLanguage() { return language; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.454+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.timezone") public String getTimezone() { return timezone; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.455+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.051+02:00", comments="Source field: user.active") public Integer getActive() { return active; } @@ -120,7 +120,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -148,7 +148,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -180,7 +180,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java index 0ab4f7d5..3ddf6f3b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java @@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ViewRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.365+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.939+02:00", comments="Source field: view.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.365+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.939+02:00", comments="Source field: view.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.366+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.940+02:00", comments="Source field: view.columns") private Integer columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.366+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.940+02:00", comments="Source field: view.position") private Integer position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.366+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.940+02:00", comments="Source field: view.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.365+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.938+02:00", comments="Source Table: view") public ViewRecord(Long id, String name, Integer columns, Integer position, Long templateId) { this.id = id; this.name = name; @@ -27,27 +27,27 @@ public class ViewRecord { this.templateId = templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.365+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.939+02:00", comments="Source field: view.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.365+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.939+02:00", comments="Source field: view.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.366+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.940+02:00", comments="Source field: view.columns") public Integer getColumns() { return columns; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.366+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.940+02:00", comments="Source field: view.position") public Integer getPosition() { return position; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.366+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:30.940+02:00", comments="Source field: view.template_id") public Long getTemplateId() { return templateId; } @@ -56,7 +56,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:30 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java index a50d31a2..c5ff3017 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java @@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class WebserviceServerInfoRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.065+02:00", comments="Source field: webservice_server_info.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.065+02:00", comments="Source field: webservice_server_info.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.066+02:00", comments="Source field: webservice_server_info.service_address") private String serviceAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source field: webservice_server_info.master") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.066+02:00", comments="Source field: webservice_server_info.master") private Integer master; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source field: webservice_server_info.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.066+02:00", comments="Source field: webservice_server_info.update_time") private Long updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.065+02:00", comments="Source Table: webservice_server_info") public WebserviceServerInfoRecord(Long id, String uuid, String serviceAddress, Integer master, Long updateTime) { this.id = id; this.uuid = uuid; @@ -27,27 +27,27 @@ public class WebserviceServerInfoRecord { this.updateTime = updateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.065+02:00", comments="Source field: webservice_server_info.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.066+02:00", comments="Source field: webservice_server_info.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.066+02:00", comments="Source field: webservice_server_info.service_address") public String getServiceAddress() { return serviceAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source field: webservice_server_info.master") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.066+02:00", comments="Source field: webservice_server_info.master") public Integer getMaster() { return master; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-04T10:34:44.465+02:00", comments="Source field: webservice_server_info.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-04-06T16:51:31.066+02:00", comments="Source field: webservice_server_info.update_time") public Long getUpdateTime() { return updateTime; } @@ -56,7 +56,7 @@ public class WebserviceServerInfoRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class WebserviceServerInfoRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class WebserviceServerInfoRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Mon Apr 04 10:34:44 CEST 2022 + * @mbg.generated Wed Apr 06 16:51:31 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationService.java index 509fd0dc..992a80c2 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationService.java @@ -194,6 +194,47 @@ public interface AuthorizationService { } + /** Check grant by using corresponding hasGrant(XY) method and throws PermissionDeniedException + * on deny. + * + * @param privilegeType the privilege type to check + * @param userInfo the the user + * @param grantEntity the entity */ + default T check( + final PrivilegeType privilegeType, + final UserInfo userInfo, + final T grantEntity) { + + // check institutional grant + if (hasGrant( + PrivilegeType.MODIFY, + EntityType.CONFIGURATION_NODE, + grantEntity.getInstitutionId(), + userInfo.uuid, + userInfo.uuid, + userInfo.institutionId, + userInfo.getUserRoles())) { + return grantEntity; + } + + // if there is no institutional grant the user may have owner based grant on the specified realm + // TODO +// return userInfo.getUserRoles() +// .stream() +// .map(role -> new RoleTypeKey(entityType, role)) +// .map(this.privileges::get) +// .anyMatch(privilege -> (privilege != null) && privilege.hasOwnershipPrivilege(privilegeType)); +// if (hasOwnerPrivilege(privilegeType, entityType, institutionId)) { +// return; +// } + + throw new PermissionDeniedException( + grantEntity.entityType(), + privilegeType, + getUserService().getCurrentUser().getUserInfo()); + + } + /** Indicates if the current user has an owner privilege for this give entity type and institution * * @param privilegeType the privilege type to check @@ -223,7 +264,7 @@ public interface AuthorizationService { * on deny or returns the given grantEntity within a Result on successful grant. * This is useful to use with a Result based functional chain. * - * @param entity The entity instance to check overall read access */ + * @param entity The entity instance to check overall read access */ default Result checkRead(final E entity) { return check(PrivilegeType.READ, entity); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/AuthorizationServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/AuthorizationServiceImpl.java index 782beec5..7f84347b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/AuthorizationServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/AuthorizationServiceImpl.java @@ -145,6 +145,7 @@ public class AuthorizationServiceImpl implements AuthorizationService { .andForRole(UserRole.EXAM_SUPPORTER) .withInstitutionalPrivilege(PrivilegeType.READ) .create(); + // grants for configuration addPrivilege(EntityType.CONFIGURATION) .forRole(UserRole.SEB_SERVER_ADMIN) @@ -156,6 +157,7 @@ public class AuthorizationServiceImpl implements AuthorizationService { .andForRole(UserRole.EXAM_SUPPORTER) .withInstitutionalPrivilege(PrivilegeType.READ) .create(); + // grants for configuration value addPrivilege(EntityType.CONFIGURATION_VALUE) .forRole(UserRole.SEB_SERVER_ADMIN) @@ -219,6 +221,17 @@ public class AuthorizationServiceImpl implements AuthorizationService { .andForRole(UserRole.INSTITUTIONAL_ADMIN) .withInstitutionalPrivilege(PrivilegeType.READ) .create(); + + // grants for batch actions + addPrivilege(EntityType.BATCH_ACTION) + .forRole(UserRole.SEB_SERVER_ADMIN) + .withBasePrivilege(PrivilegeType.READ) + .withInstitutionalPrivilege(PrivilegeType.WRITE) + .andForRole(UserRole.INSTITUTIONAL_ADMIN) + .withInstitutionalPrivilege(PrivilegeType.WRITE) + .andForRole(UserRole.EXAM_ADMIN) + .withInstitutionalPrivilege(PrivilegeType.WRITE) + .create(); } @Override diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/BatchActionExec.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/BatchActionExec.java index 79b6dce9..81ebb4c4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/BatchActionExec.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/BatchActionExec.java @@ -12,6 +12,7 @@ import java.util.Map; import ch.ethz.seb.sebserver.gbl.api.API.BatchActionType; import ch.ethz.seb.sebserver.gbl.api.APIMessage; +import ch.ethz.seb.sebserver.gbl.model.BatchAction; import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.util.Result; @@ -35,8 +36,8 @@ public interface BatchActionExec { /** Executes the action on a single entity. * * @param modelId The model identifier of the entity to process - * @param actionAttributes defined batch action attributes + * @param batchAction The batch action metadata * @return Result refer to the entity key or to an error when happened */ - Result doSingleAction(String modelId, Map actionAttributes); + Result doSingleAction(String modelId, BatchAction batchAction); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/BatchActionService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/BatchActionService.java index a0130a2e..26b1ddf7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/BatchActionService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/BatchActionService.java @@ -9,9 +9,7 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction; import java.util.Collection; -import java.util.Map; -import ch.ethz.seb.sebserver.gbl.api.API.BatchActionType; import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.model.BatchAction; import ch.ethz.seb.sebserver.gbl.util.Result; @@ -21,18 +19,16 @@ import ch.ethz.seb.sebserver.gbl.util.Result; * can be reported to the user showing successful action as well as actions that has failed. */ public interface BatchActionService { - /** Use this to register a new batch action for further processing. + /** Validates a given batch action. * - * @param institutionId The institution identifier - * @param actionType The batch action type - * @param batchAction specific batch action attributes - * @param ids comma separated String of model ids to process - * @return Result refer to the stored batch action or to an error when happened */ - Result registerNewBatchAction( - final Long institutionId, - BatchActionType actionType, - Map actionAttributes, - String ids); + * @param batchAction + * @return Result refer to the BatchAction or to an error when happened */ + Result validate(BatchAction batchAction); + + /** Use this to notify a new batch action for further processing. + * + * @param batchAction BatchAction */ + Result notifyNewBatchAction(BatchAction batchAction); /** Use this to get a specific BatchAction. * diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/BatchActionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/BatchActionServiceImpl.java index 4e41b2a3..d7f3e4a9 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/BatchActionServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/BatchActionServiceImpl.java @@ -9,11 +9,9 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.impl; import java.time.Instant; -import java.util.Arrays; import java.util.Collection; import java.util.EnumMap; import java.util.HashSet; -import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.concurrent.ScheduledFuture; @@ -26,20 +24,17 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.api.API; import ch.ethz.seb.sebserver.gbl.api.API.BatchActionType; import ch.ethz.seb.sebserver.gbl.api.APIMessage; import ch.ethz.seb.sebserver.gbl.api.APIMessage.APIMessageException; import ch.ethz.seb.sebserver.gbl.api.EntityType; -import ch.ethz.seb.sebserver.gbl.api.JSONMapper; import ch.ethz.seb.sebserver.gbl.model.BatchAction; import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BatchActionExec; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BatchActionService; -import ch.ethz.seb.sebserver.webservice.servicelayer.dao.AdditionalAttributesDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.BatchActionDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ResourceNotFoundException; @@ -50,11 +45,7 @@ public class BatchActionServiceImpl implements BatchActionService { private static final Logger log = LoggerFactory.getLogger(BatchActionServiceImpl.class); - public static final String BATCH_ACTION_ERROR_ATTR_NAME = "batchActionError"; - private final BatchActionDAO batchActionDAO; - private final AdditionalAttributesDAO additionalAttributesDAO; - private final JSONMapper jsonMapper; private final TaskScheduler taskScheduler; private final EnumMap batchExecutions; @@ -62,62 +53,44 @@ public class BatchActionServiceImpl implements BatchActionService { public BatchActionServiceImpl( final BatchActionDAO batchActionDAO, - final AdditionalAttributesDAO additionalAttributesDAO, - final JSONMapper jsonMapper, final Collection batchExecutions, final TaskScheduler taskScheduler) { this.batchActionDAO = batchActionDAO; - this.additionalAttributesDAO = additionalAttributesDAO; - this.jsonMapper = jsonMapper; this.taskScheduler = taskScheduler; this.batchExecutions = new EnumMap<>(BatchActionType.class); - batchExecutions.stream() - .map(exec -> this.batchExecutions.putIfAbsent(exec.actionType(), exec)) - .findAny() - .ifPresent(exec -> log.error( - "BatchActionExec mismatch. It seems there is already a BatchActionExec for type: {} registered!", - exec.actionType())); + batchExecutions + .stream() + .forEach(exec -> this.batchExecutions.putIfAbsent(exec.actionType(), exec)); } @Override - public Result registerNewBatchAction( - final Long institutionId, - final BatchActionType actionType, - final Map actionAttributes, - final String ids) { + public Result validate(final BatchAction batchAction) { return Result.tryCatch(() -> { - final BatchActionExec batchActionExec = this.batchExecutions.get(actionType); + final BatchActionExec batchActionExec = this.batchExecutions.get(batchAction.actionType); if (batchActionExec == null) { throw new IllegalArgumentException( - "Batch action execution not found for batch action type: " + actionType); + "Batch action execution not found for batch action type: " + batchAction.actionType); } - final APIMessage consistencyError = batchActionExec.checkConsistency(actionAttributes); + final APIMessage consistencyError = batchActionExec.checkConsistency(batchAction.attributes); if (consistencyError != null) { throw new APIMessageException(consistencyError); } - final Collection sourceIds = Arrays.asList(StringUtils.split( - ids, - Constants.LIST_SEPARATOR)); + return batchAction; - return this.batchActionDAO - .createNew(new BatchAction( - null, - institutionId, - actionType, - actionAttributes, - sourceIds, - null, null, null)) - .map(res -> { - processNextBatchAction(); - return res; - }) - .getOrThrow(); + }); + } + + @Override + public Result notifyNewBatchAction(final BatchAction batchAction) { + return Result.tryCatch(() -> { + processNextBatchAction(); + return batchAction; }); } @@ -133,7 +106,7 @@ public class BatchActionServiceImpl implements BatchActionService { String.valueOf(institutionId))) .map(results -> results.stream() .filter(action -> StringUtils.isNotBlank(action.processorId) && - !action.processorId.endsWith(BatchActionDAO.FLAG_FINISHED)) + !action.processorId.endsWith(BatchAction.FINISHED_FLAG)) .collect(Collectors.toList())); } @@ -144,7 +117,7 @@ public class BatchActionServiceImpl implements BatchActionService { String.valueOf(institutionId))) .map(results -> results.stream() .filter(action -> StringUtils.isNotBlank(action.processorId) && - !action.processorId.endsWith(BatchActionDAO.FLAG_FINISHED)) + !action.processorId.endsWith(BatchAction.FINISHED_FLAG)) .filter(action -> action.actionType.entityType == entityType) .collect(Collectors.toList())); } @@ -156,7 +129,7 @@ public class BatchActionServiceImpl implements BatchActionService { String.valueOf(institutionId))) .map(results -> results.stream() .filter(action -> StringUtils.isNotBlank(action.processorId) && - action.processorId.endsWith(BatchActionDAO.FLAG_FINISHED)) + action.processorId.endsWith(BatchAction.FINISHED_FLAG)) .collect(Collectors.toList())); } @@ -178,29 +151,23 @@ public class BatchActionServiceImpl implements BatchActionService { final String processorId = UUID.randomUUID().toString(); log.debug("Check for pending batch action with processorId: {}", processorId); - final BatchAction batchAction = this.batchActionDAO + this.batchActionDAO .getAndReserveNext(processorId) - .onErrorDo(error -> { + .onSuccess(action -> { + this.runningBatchProcess = this.taskScheduler.schedule( + new BatchActionProcess( + new BatchActionHandlerImpl(action), + this.batchExecutions.get(action.actionType), + action), + Instant.now()); + }) + .onError(error -> { if (error instanceof ResourceNotFoundException) { - log.debug("No batch pending actions found for processing."); - return null; + log.debug("No pending batch action found..."); } else { throw new RuntimeException(error); } - }) - .getOrThrow(); - - if (batchAction == null) { - log.debug("No pending batch action found..."); - return; - } - - this.runningBatchProcess = this.taskScheduler.schedule( - new BatchActionProcess( - new BatchActionHandlerImpl(batchAction), - this.batchExecutions.get(batchAction.actionType), - batchAction), - Instant.now()); + }); } catch (final Exception e) { log.error("Failed to schedule BatchActionProcess task: ", e); @@ -238,16 +205,19 @@ public class BatchActionServiceImpl implements BatchActionService { .stream() .forEach(modelId -> { - log.debug("Process batch action type: {}, id: {}", this.batchAction.actionType, modelId); + if (log.isDebugEnabled()) { + log.debug("Process batch action type: {}, id: {}", + this.batchAction.actionType, + modelId); + } this.batchActionExec - .doSingleAction(modelId, this.batchAction.attributes) + .doSingleAction(modelId, this.batchAction) .onError(error -> this.batchActionHandler.handleError(modelId, error)) .onSuccess(entityKey -> this.batchActionHandler.handleSuccess(entityKey)); - }); - log.info("Finished batch action - {}", this.batchAction); + this.batchActionHandler.finishUp(); } catch (final Exception e) { log.error("Unexpected error while batch action processing. processorId: {} action: ", @@ -263,6 +233,8 @@ public class BatchActionServiceImpl implements BatchActionService { void handleSuccess(final EntityKey entityKey); void handleError(final String modelId, final Exception error); + + void finishUp(); } private final class BatchActionHandlerImpl implements BatchActionHandler { @@ -275,12 +247,10 @@ public class BatchActionServiceImpl implements BatchActionService { @Override public void handleSuccess(final EntityKey entityKey) { - BatchActionServiceImpl.this.batchActionDAO - .updateProgress( - this.batchAction.id, - this.batchAction.processorId, - entityKey.modelId) - .onError(error -> log.error("Failed to save progress: ", error)); + BatchActionServiceImpl.this.batchActionDAO.setSuccessfull( + this.batchAction.id, + this.batchAction.processorId, + entityKey.modelId); } @Override @@ -291,28 +261,22 @@ public class BatchActionServiceImpl implements BatchActionService { this.batchAction, error); - APIMessage apiMessage = null; - if (error instanceof APIMessageException) { - apiMessage = ((APIMessageException) error).getMainMessage(); - } else { - apiMessage = APIMessage.ErrorMessage.UNEXPECTED.of(error); - } - - if (apiMessage != null) { - // save error message for reporting - try { - BatchActionServiceImpl.this.additionalAttributesDAO.saveAdditionalAttribute( - EntityType.BATCH_ACTION, - this.batchAction.id, - BATCH_ACTION_ERROR_ATTR_NAME, - BatchActionServiceImpl.this.jsonMapper.writeValueAsString(apiMessage)) - .getOrThrow(); - } catch (final Exception e) { - log.error("Unexpected error while trying to persist batch action error: {}", apiMessage, error); - } - } + BatchActionServiceImpl.this.batchActionDAO.setFailure( + this.batchAction.id, + this.batchAction.processorId, + modelId, + error); } + @Override + public void finishUp() { + BatchActionServiceImpl.this.batchActionDAO + .finishUp(this.batchAction.id, this.batchAction.processorId, false) + .onSuccess(action -> log.info("Finished batch action - {}", action)) + .onError(error -> log.error( + "Failed to mark batch action as finished: {}", + this.batchAction, error)); + } } } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/ExamConfigStateChange.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/ExamConfigStateChange.java index 13271f99..cf6e4817 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/ExamConfigStateChange.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/impl/ExamConfigStateChange.java @@ -10,22 +10,49 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.impl; import java.util.Map; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import ch.ethz.seb.sebserver.gbl.api.API.BatchActionType; import ch.ethz.seb.sebserver.gbl.api.APIMessage; +import ch.ethz.seb.sebserver.gbl.api.authorization.PrivilegeType; import ch.ethz.seb.sebserver.gbl.model.BatchAction; +import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.EntityKey; +import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationStatus; +import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationService; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BatchActionExec; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationNodeDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig.ExamConfigService; import io.micrometer.core.instrument.util.StringUtils; +@Lazy @Component @WebServiceProfile public class ExamConfigStateChange implements BatchActionExec { + private final ExamConfigService sebExamConfigService; + private final ConfigurationNodeDAO configurationNodeDAO; + private final AuthorizationService authorizationService; + private final UserDAO userDAO; + + public ExamConfigStateChange( + final ExamConfigService sebExamConfigService, + final ConfigurationNodeDAO configurationNodeDAO, + final AuthorizationService authorizationService, + final UserDAO userDAO) { + + this.sebExamConfigService = sebExamConfigService; + this.configurationNodeDAO = configurationNodeDAO; + this.authorizationService = authorizationService; + this.userDAO = userDAO; + } + @Override public BatchActionType actionType() { return BatchActionType.EXAM_CONFIG_STATE_CHANGE; @@ -42,13 +69,22 @@ public class ExamConfigStateChange implements BatchActionExec { } @Override - public Result doSingleAction(final String modelId, final Map actionAttributes) { - return Result.tryCatch(() -> { + public Result doSingleAction(final String modelId, final BatchAction batchAction) { - final ConfigurationStatus targetState = getTargetState(actionAttributes); + final UserInfo user = this.userDAO + .byModelId(batchAction.ownerId) + .getOrThrow(); + + return this.configurationNodeDAO + .byModelId(modelId) + .map(node -> this.authorizationService.check(PrivilegeType.MODIFY, user, node)) + .map(node -> new ConfigurationNode( + node.id, null, null, null, null, null, null, + getTargetState(batchAction.attributes))) + .flatMap(this.sebExamConfigService::checkSaveConsistency) + .flatMap(this.configurationNodeDAO::save) + .map(Entity::getEntityKey); - return new EntityKey(modelId, actionType().entityType); - }); } private ConfigurationStatus getTargetState(final Map actionAttributes) { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/BatchActionDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/BatchActionDAO.java index ebcd57ac..88a5a242 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/BatchActionDAO.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/BatchActionDAO.java @@ -13,8 +13,6 @@ import ch.ethz.seb.sebserver.gbl.util.Result; public interface BatchActionDAO extends EntityDAO { - public static final String FLAG_FINISHED = "_FINISHED"; - /** This checks if there is a pending batch action to process next. * If so this reserves the pending batch action and mark it to be processed * by the given pocessId. @@ -24,14 +22,6 @@ public interface BatchActionDAO extends EntityDAO { * @return Result refer to the batch action to process or to an error when happened */ Result getAndReserveNext(String processId); - /** Use this to update the processing of a running batch action - * - * @param actionId The batch action identifier - * @param processorId The processor identifier (must match with the processorId on persistent storage) - * @param modelId model identifiers of entity that has successfully been processed. - * @return Result refer to the involved batch action or to an error when happened. */ - Result updateProgress(Long actionId, String processorId, String modelId); - /** Use this to mark processing of a single entity of a specified batch action as successful completed. * * @param actionId The batch action identifier @@ -39,6 +29,14 @@ public interface BatchActionDAO extends EntityDAO { * @param modelId The model identifier to mark as completed for the given batch action */ void setSuccessfull(Long actionId, String processId, String modelId); + /** Use this to mark processing of a single entity of a specified batch action as failed. + * + * @param actionId The batch action identifier + * @param processId The process identifier (must match with the processId on persistent storage) + * @param modelId The model identifier to mark as failure for the given batch action + * @param error The failure error if available */ + void setFailure(Long actionId, String processId, String modelId, Exception error); + /** This is used by a processing background task that is processing a batch action to finish up * its work and register the batch action as done within the persistent storage. *

diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/BatchActionDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/BatchActionDAOImpl.java index 3bb2dadf..2b04a8e5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/BatchActionDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/BatchActionDAOImpl.java @@ -16,6 +16,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -28,6 +29,8 @@ import org.springframework.transaction.annotation.Transactional; import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.api.API.BatchActionType; +import ch.ethz.seb.sebserver.gbl.api.APIMessage; +import ch.ethz.seb.sebserver.gbl.api.APIMessage.APIMessageException; import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.JSONMapper; import ch.ethz.seb.sebserver.gbl.model.BatchAction; @@ -38,7 +41,9 @@ import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.BatchActionRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.BatchActionRecordMapper; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.AdditionalAttributeRecord; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.BatchActionRecord; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.AdditionalAttributesDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.BatchActionDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.DAOLoggingSupport; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap; @@ -53,13 +58,16 @@ public class BatchActionDAOImpl implements BatchActionDAO { private static final long ABANDONED_BATCH_TIME = Constants.MINUTE_IN_MILLIS * 10; private final BatchActionRecordMapper batchActionRecordMapper; + private final AdditionalAttributesDAO additionalAttributesDAO; private final JSONMapper jsonMapper; public BatchActionDAOImpl( final BatchActionRecordMapper batchActionRecordMapper, + final AdditionalAttributesDAO additionalAttributesDAO, final JSONMapper jsonMapper) { this.batchActionRecordMapper = batchActionRecordMapper; + this.additionalAttributesDAO = additionalAttributesDAO; this.jsonMapper = jsonMapper; } @@ -74,21 +82,17 @@ public class BatchActionDAOImpl implements BatchActionDAO { return Result.tryCatch(() -> { final Long oldThreshold = Utils.getMillisecondsNow() - ABANDONED_BATCH_TIME; - final List next = this.batchActionRecordMapper.selectByExample() + final BatchActionRecord nextRec = this.batchActionRecordMapper.selectByExample() .where(BatchActionRecordDynamicSqlSupport.lastUpdate, isNull()) - .and(BatchActionRecordDynamicSqlSupport.processorId, isNull()) - .or(BatchActionRecordDynamicSqlSupport.lastUpdate, isLessThan(oldThreshold)) + .or(BatchActionRecordDynamicSqlSupport.processorId, isNotLike("%" + BatchAction.FINISHED_FLAG)) .build() - .execute(); - - if (next == null || next.isEmpty()) { - - throw new ResourceNotFoundException( - EntityType.BATCH_ACTION, - processId); - } - - final BatchActionRecord nextRec = next.get(0); + .execute() + .stream() + .filter(rec -> rec.getLastUpdate() == null || rec.getLastUpdate() < oldThreshold) + .findFirst() + .orElseThrow(() -> new ResourceNotFoundException( + EntityType.BATCH_ACTION, + processId)); final BatchActionRecord newRecord = new BatchActionRecord( nextRec.getId(), @@ -97,6 +101,7 @@ public class BatchActionDAOImpl implements BatchActionDAO { null, null, null, + null, Utils.getMillisecondsNow(), processId); @@ -107,43 +112,6 @@ public class BatchActionDAOImpl implements BatchActionDAO { .onError(TransactionHandler::rollback); } - @Override - @Transactional - public Result updateProgress( - final Long actionId, - final String processorId, - final String modelId) { - - return Result.tryCatch(() -> { - - final BatchActionRecord rec = this.batchActionRecordMapper.selectByPrimaryKey(actionId); - - if (!processorId.equals(rec.getProcessorId())) { - throw new RuntimeException("Batch action processor id mismatch: " + processorId + " " + rec); - } - - final Set ids = new HashSet<>(Arrays.asList(StringUtils.split( - rec.getSuccessful(), - Constants.LIST_SEPARATOR))); - ids.add(modelId); - - final BatchActionRecord newRecord = new BatchActionRecord( - actionId, - null, - null, - null, - null, - StringUtils.join(ids, Constants.LIST_SEPARATOR), - Utils.getMillisecondsNow(), - null); - - this.batchActionRecordMapper.updateByPrimaryKeySelective(newRecord); - return this.batchActionRecordMapper.selectByPrimaryKey(actionId); - }) - .flatMap(this::toDomainModel) - .onError(TransactionHandler::rollback); - } - @Override @Transactional public void setSuccessfull(final Long actionId, final String processId, final String modelId) { @@ -155,19 +123,54 @@ public class BatchActionDAOImpl implements BatchActionDAO { throw new RuntimeException("Batch action processor id mismatch: " + processId + " " + rec); } + String successful = rec.getSuccessful(); + if (StringUtils.isBlank(successful)) { + successful = modelId; + } else { + final Set ids = new HashSet<>(Arrays.asList(StringUtils.split( + successful, + Constants.LIST_SEPARATOR))); + ids.add(modelId); + successful = StringUtils.join(ids, Constants.LIST_SEPARATOR); + } + final BatchActionRecord newRecord = new BatchActionRecord( actionId, null, null, null, null, - rec.getSuccessful() + Constants.LIST_SEPARATOR + modelId, + null, + successful, Utils.getMillisecondsNow(), processId); this.batchActionRecordMapper.updateByPrimaryKeySelective(newRecord); } catch (final Exception e) { - log.error("Failed to mark entity sucessfuly processed: modelId: {}, processId"); + log.error("Failed to mark entity successfully processed: modelId: {}, processId", modelId, e); + } + } + + @Override + @Transactional + public void setFailure(final Long actionId, final String processId, final String modelId, final Exception error) { + try { + String apiMessage = null; + if (error instanceof APIMessageException) { + apiMessage = this.jsonMapper.writeValueAsString(((APIMessageException) error).getMainMessage()); + } else { + apiMessage = this.jsonMapper.writeValueAsString(APIMessage.ErrorMessage.UNEXPECTED.of(error)); + } + + this.additionalAttributesDAO + .saveAdditionalAttribute(EntityType.BATCH_ACTION, actionId, modelId, apiMessage) + .onError(err -> log.error("Failed to store batch action failure: actionId: {}, modelId: {}", + actionId, + modelId, + err)); + + } catch (final Exception e) { + log.error("Unexpected error while trying to persist batch action error: ", e); } } @@ -188,13 +191,22 @@ public class BatchActionDAOImpl implements BatchActionDAO { rec.getSourceIds(), Constants.LIST_SEPARATOR))); - final Set success = new HashSet<>(Arrays.asList(StringUtils.split( - rec.getSourceIds(), - Constants.LIST_SEPARATOR))); + // get all succeeded + final String successful = rec.getSuccessful(); + final Set success = StringUtils.isNotBlank(successful) + ? new HashSet<>(Arrays.asList(StringUtils.split( + successful, + Constants.LIST_SEPARATOR))) + : Collections.emptySet(); - if (ids.size() != success.size()) { + // get all failed + final Collection failed = this.additionalAttributesDAO + .getAdditionalAttributes(EntityType.BATCH_ACTION, actionId) + .getOrThrow(); + + if (ids.size() != success.size() + failed.size()) { throw new IllegalStateException( - "Processing ids mismatch source: " + ids + " success: " + success); + "Processing ids mismatch source: " + ids + " success: " + success + " failed: " + failed); } } @@ -205,8 +217,9 @@ public class BatchActionDAOImpl implements BatchActionDAO { null, null, null, + null, Utils.getMillisecondsNow(), - processId + FLAG_FINISHED); + processId + BatchAction.FINISHED_FLAG); this.batchActionRecordMapper.updateByPrimaryKeySelective(newRecord); return this.batchActionRecordMapper.selectByPrimaryKey(actionId); @@ -219,7 +232,7 @@ public class BatchActionDAOImpl implements BatchActionDAO { @Transactional(readOnly = true) public Result byPK(final Long id) { return recordById(id) - .flatMap(this::toDomainModel); + .flatMap(this::toDomainModelWithFailures); } @Override @@ -273,6 +286,7 @@ public class BatchActionDAOImpl implements BatchActionDAO { final BatchActionRecord newRecord = new BatchActionRecord( null, data.institutionId, + data.ownerId, data.actionType.toString(), data.attributes != null ? this.jsonMapper.writeValueAsString(data.attributes) : null, StringUtils.join(data.sourceIds, Constants.LIST_SEPARATOR), @@ -296,6 +310,7 @@ public class BatchActionDAOImpl implements BatchActionDAO { null, null, null, + null, StringUtils.join(data.successful, Constants.LIST_SEPARATOR), data.getLastUpdate(), data.processorId); @@ -318,6 +333,15 @@ public class BatchActionDAOImpl implements BatchActionDAO { return Collections.emptyList(); } + // try delete all additional attributes first + ids.stream().forEach(id -> { + try { + this.additionalAttributesDAO.deleteAll(EntityType.BATCH_ACTION, id); + } catch (final Exception e) { + log.error("Failed to delete additional attributes for batch action: {}", id, e); + } + }); + this.batchActionRecordMapper.deleteByExample() .where(BatchActionRecordDynamicSqlSupport.id, isIn(ids)) .build() @@ -341,16 +365,58 @@ public class BatchActionDAOImpl implements BatchActionDAO { }); } + private Result toDomainModelWithFailures(final BatchActionRecord record) { + return toDomainModel(record, true); + } + private Result toDomainModel(final BatchActionRecord record) { + return toDomainModel(record, false); + } + + private Result toDomainModel(final BatchActionRecord record, final boolean withFailures) { + final String successful = record.getSuccessful(); + + Map failures = Collections.emptyMap(); + try { + failures = this.additionalAttributesDAO + .getAdditionalAttributes(EntityType.BATCH_ACTION, record.getId()) + .getOrThrow() + .stream() + .collect(Collectors.toMap(this::toEntityKey, this::toFailureMessage)); + } catch (final Exception e) { + log.error("Failed to get batch action failure messages", e); + } + + final Map failuresMap = failures; return Result.tryCatch(() -> new BatchAction( record.getId(), record.getInstitutionId(), + record.getOwner(), BatchActionType.valueOf(record.getActionType()), Utils.jsonToMap(record.getAttributes(), this.jsonMapper), Arrays.asList(record.getSourceIds().split(Constants.LIST_SEPARATOR)), - Arrays.asList(record.getSuccessful().split(Constants.LIST_SEPARATOR)), + StringUtils.isNoneBlank(successful) ? Arrays.asList(successful.split(Constants.LIST_SEPARATOR)) : null, record.getLastUpdate(), - record.getProcessorId())); + record.getProcessorId(), + failuresMap)); + } + + private String toEntityKey(final AdditionalAttributeRecord rec) { + try { + return rec.getName(); + } catch (final Exception e) { + log.error("Failed to parse entity key for batch action failure: {}", e.getMessage()); + return "-1"; + } + } + + private APIMessage toFailureMessage(final AdditionalAttributeRecord rec) { + try { + return this.jsonMapper.readValue(rec.getValue(), APIMessage.class); + } catch (final Exception e) { + log.error("Failed to parse APIMessage for batch action failure: {}", e.getMessage()); + return APIMessage.ErrorMessage.UNEXPECTED.of(e); + } } } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/APIExceptionHandler.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/APIExceptionHandler.java index 19af5f4a..f3fec7b1 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/APIExceptionHandler.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/APIExceptionHandler.java @@ -239,6 +239,17 @@ public class APIExceptionHandler extends ResponseEntityExceptionHandler { HttpStatus.BAD_REQUEST); } + @ExceptionHandler(UnsupportedOperationException.class) + public ResponseEntity handleUnsupportedOperationException( + final UnsupportedOperationException ex, + final WebRequest request) { + + return new ResponseEntity<>( + Arrays.asList(APIMessage.ErrorMessage.ILLEGAL_API_ARGUMENT.of(ex)), + Utils.createJsonContentHeader(), + HttpStatus.BAD_REQUEST); + } + @ExceptionHandler(CompletionException.class) public ResponseEntity handleCompletionException( final CompletionException ex, diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/BatchActionController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/BatchActionController.java new file mode 100644 index 00000000..232e5b01 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/BatchActionController.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2022 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.weblayer.api; + +import org.mybatis.dynamic.sql.SqlTable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.POSTMapper; +import ch.ethz.seb.sebserver.gbl.model.BatchAction; +import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; +import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.BatchActionRecordDynamicSqlSupport; +import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService; +import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationService; +import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BatchActionService; +import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionService; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.EntityDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationService; + +@WebServiceProfile +@RestController +@RequestMapping("${sebserver.webservice.api.admin.endpoint}" + API.BATCH_ACTION_ENDPOINT) +public class BatchActionController extends EntityController { + + private final BatchActionService batchActionService; + + protected BatchActionController( + final AuthorizationService authorization, + final BulkActionService bulkActionService, + final EntityDAO entityDAO, + final UserActivityLogDAO userActivityLogDAO, + final PaginationService paginationService, + final BeanValidationService beanValidationService, + final BatchActionService batchActionService) { + + super( + authorization, + bulkActionService, + entityDAO, + userActivityLogDAO, + paginationService, + beanValidationService); + + this.batchActionService = batchActionService; + } + + @Override + protected BatchAction createNew(final POSTMapper postParams) { + return new BatchAction( + null, + super.authorization.getUserService().getCurrentUser().getUserInfo().uuid, + postParams); + } + + @Override + protected Result validForCreate(final BatchAction entity) { + return this.batchActionService.validate(entity); + } + + @Override + protected Result validForSave(final BatchAction entity) { + throw new UnsupportedOperationException("Save already existing BatchAction is not supported"); + } + + @Override + protected Result notifyCreated(final BatchAction entity) { + return this.batchActionService.notifyNewBatchAction(entity); + } + + @Override + protected SqlTable getSQLTableOfEntity() { + return BatchActionRecordDynamicSqlSupport.batchActionRecord; + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ConfigurationNodeController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ConfigurationNodeController.java index 9468efda..85ddec35 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ConfigurationNodeController.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ConfigurationNodeController.java @@ -502,37 +502,7 @@ public class ConfigurationNodeController extends EntityController validForSave(final ConfigurationNode entity) { - return super.validForSave(entity) - .map(e -> { - final ConfigurationNode existingNode = this.entityDAO.byPK(entity.id) - .getOrThrow(); - if (existingNode.type != entity.type) { - throw new APIConstraintViolationException( - "The Type of ConfigurationNode cannot change after creation"); - } - return e; - }) - .map(this::checkChangeToArchived); - } - - private ConfigurationNode checkChangeToArchived(final ConfigurationNode entity) { - if (entity.status == ConfigurationStatus.ARCHIVED) { - // check if we have a change to archived - final ConfigurationNode persistentNode = this.configurationNodeDAO - .byPK(entity.id) - .getOrThrow(); - // yes we have - if (persistentNode.status != ConfigurationStatus.ARCHIVED) { - // check if this is possible (no upcoming or running exams involved) - if (!this.examConfigurationMapDAO.checkNoActiveExamReferences(entity.id).getOr(false)) { - throw new APIMessageException( - APIMessage.ErrorMessage.INTEGRITY_VALIDATION - .of("Exam configuration has references to at least one upcoming or running exam.")); - } - } - } - - return entity; + return this.sebExamConfigService.checkSaveConsistency(entity); } @Override diff --git a/src/main/resources/config/sql/base/V15__alterTables_v1_4.sql b/src/main/resources/config/sql/base/V15__alterTables_v1_4.sql index e5498f62..9ca52ab5 100644 --- a/src/main/resources/config/sql/base/V15__alterTables_v1_4.sql +++ b/src/main/resources/config/sql/base/V15__alterTables_v1_4.sql @@ -4,5 +4,6 @@ ALTER TABLE `batch_action` MODIFY `source_ids` VARCHAR(4000) NULL, +ADD COLUMN IF NOT EXISTS `owner` VARCHAR(255) NULL AFTER `institution_id`, ADD COLUMN IF NOT EXISTS `attributes` VARCHAR(4000) NULL AFTER `action_type` ; diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 4be4b3a8..0a447fec 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -75,6 +75,8 @@ sebserver.overall.activity.title.sebconfig=Configurations sebserver.overall.activity.title.examadmin=Exam Administration sebserver.overall.activity.title.monitoring=Monitoring +sebserver.overall.batchaction.selected=Selected + ################################ # Form validation and messages ################################ @@ -810,6 +812,14 @@ sebserver.examconfig.info.pleaseSelect=At first please select an Exam Configurat sebserver.examconfig.list.action.no.modify.privilege=No Access: An Exam Configuration from other institution cannot be modified. sebserver.examconfig.action.list.new=Add Exam Configuration sebserver.examconfig.action.list.view=View Exam Configuration +sebserver.examconfig.list.action.statechange=State Change +sebserver.examconfig.list.batch.statechange.title=Bulk State Change +sebserver.examconfig.list.batch.action.statechange=Change States +sebserver.examconfig.list.batch.progress=Bulk State Change in Progress: {0}% +sebserver.examconfig.list.batch.finished=Bulk State Change finished. Successful: {0}.Failed: {1} +sebserver.examconfig.list.batch.action.statechange.info=This action changes all selected exam configurations to a defined target state.
Please note that this will be done only for those that can be changed to the defined target state in regard to its current state. +sebserver.examconfig.list.batch.action.status=Target Status + sebserver.examconfig.action.list.modify.properties=Edit Exam Configuration sebserver.examconfig.action.delete=Delete Exam Configuration @@ -847,6 +857,8 @@ sebserver.examconfig.message.delete.confirm=The exam configuration ({0}) was suc sebserver.examconfig.message.delete.partialerror=The exam configuration ({0}) was deleted but there where some dependency errors:

{1} + + sebserver.examconfig.form.title.new=Add Exam Configuration sebserver.examconfig.form.title=Exam Configuration sebserver.examconfig.form.title.subtitle= diff --git a/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java b/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java index a0251bbb..02f6fdfd 100644 --- a/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java @@ -3341,7 +3341,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { assertTrue(applyCall.hasError()); assertTrue(applyCall.getError() instanceof RestCallError); - assertTrue(applyCall.getError().getCause().getMessage().contains("SEB Restriction feature not available")); + assertTrue(applyCall.getError().toString().contains("SEB Restriction feature not available")); final Result deleteCall = restService .getBuilder(DeactivateSEBRestriction.class) @@ -3350,7 +3350,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { assertTrue(deleteCall.hasError()); assertTrue(deleteCall.getError() instanceof RestCallError); - assertTrue(deleteCall.getError().getCause().getMessage().contains("SEB Restriction feature not available")); + assertTrue(deleteCall.getError().toString().contains("SEB Restriction feature not available")); final Result chaptersCall = restService .getBuilder(GetCourseChapters.class) @@ -3359,7 +3359,7 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { assertTrue(chaptersCall.hasError()); assertTrue(chaptersCall.getError() instanceof RestCallError); - assertTrue(chaptersCall.getError().getCause().getMessage().contains("Course Chapter feature not supported")); + assertTrue(chaptersCall.getError().toString().contains("Course Chapter feature not supported")); } diff --git a/src/test/resources/schema-test.sql b/src/test/resources/schema-test.sql index b72c79e0..df6423bd 100644 --- a/src/test/resources/schema-test.sql +++ b/src/test/resources/schema-test.sql @@ -645,8 +645,10 @@ DROP TABLE IF EXISTS `batch_action` ; CREATE TABLE IF NOT EXISTS `batch_action` ( `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `institution_id` BIGINT UNSIGNED NOT NULL, + `owner` VARCHAR(255) NULL, `action_type` VARCHAR(45) NOT NULL, - `source_ids` VARCHAR(8000) NULL, + `attributes` VARCHAR(4000) NULL, + `source_ids` VARCHAR(4000) NULL, `successful` VARCHAR(4000) NULL, `last_update` BIGINT NULL, `processor_id` VARCHAR(45) NULL,