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 bf71cb1a..a4a6c6bb 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-05-12T16:13:18.102+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2022-05-16T11:24:18.256+02:00") public enum EntityType { CONFIGURATION_ATTRIBUTE, CONFIGURATION_VALUE, 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 7f1ab16d..c67ad7ea 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-05-12T16:13:18.024+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2022-05-16T11:24:18.186+02:00") public interface Domain { interface CONFIGURATION_ATTRIBUTE { @@ -113,6 +113,10 @@ public interface Domain { String ATTR_ACTIVE = "active"; String ATTR_EXAM_TEMPLATE_ID = "examTemplateId"; String ATTR_LAST_MODIFIED = "lastModified"; + String ATTR_QUIZ_NAME = "quizName"; + String ATTR_QUIZ_START_TIME = "quizStartTime"; + String ATTR_QUIZ_END_TIME = "quizEndTime"; + String ATTR_LMS_AVAILABLE = "lmsAvailable"; } interface CLIENT_CONNECTION { diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java index 2a3fc960..bdb0adcb 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java @@ -11,6 +11,7 @@ package ch.ethz.seb.sebserver.gbl.model.exam; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.Map; import javax.validation.constraints.NotNull; @@ -29,6 +30,7 @@ import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.POSTMapper; import ch.ethz.seb.sebserver.gbl.model.Domain.EXAM; import ch.ethz.seb.sebserver.gbl.model.GrantEntity; +import ch.ethz.seb.sebserver.gbl.util.Utils; @JsonIgnoreProperties(ignoreUnknown = true) public final class Exam implements GrantEntity { @@ -40,10 +42,8 @@ public final class Exam implements GrantEntity { Constants.EMPTY_NOTE, false, Constants.EMPTY_NOTE, - Constants.EMPTY_NOTE, null, null, - Constants.EMPTY_NOTE, ExamType.UNDEFINED, null, null, @@ -60,15 +60,13 @@ public final class Exam implements GrantEntity { public static final String FILTER_ATTR_STATUS = "status"; public static final String FILTER_CACHED_QUIZZES = "cached-quizzes"; - public static final String ATTR_LMS_DATA_AVAILABLE = "lmsDataAvailable"; public static final String ATTR_ADDITIONAL_ATTRIBUTES = "additionalAttributes"; public enum ExamStatus { UP_COMING, RUNNING, FINISHED, - CORRUPT_NO_LMS_CONNECTION, - CORRUPT_INVALID_ID + ARCHIVED } public enum ExamType { @@ -93,24 +91,18 @@ public final class Exam implements GrantEntity { @NotNull public final String externalId; - @JsonProperty(ATTR_LMS_DATA_AVAILABLE) - public final Boolean lmsDataAvailable; + @JsonProperty(EXAM.ATTR_LMS_AVAILABLE) + public final Boolean lmsAvailable; - @JsonProperty(QuizData.QUIZ_ATTR_NAME) + @JsonProperty(EXAM.ATTR_QUIZ_NAME) public final String name; - @JsonProperty(QuizData.QUIZ_ATTR_DESCRIPTION) - public final String description; - - @JsonProperty(QuizData.QUIZ_ATTR_START_TIME) + @JsonProperty(EXAM.ATTR_QUIZ_START_TIME) public final DateTime startTime; - @JsonProperty(QuizData.QUIZ_ATTR_END_TIME) + @JsonProperty(EXAM.ATTR_QUIZ_END_TIME) public final DateTime endTime; - @JsonProperty(QuizData.QUIZ_ATTR_START_URL) - public final String startURL; - @JsonProperty(EXAM.ATTR_TYPE) @NotNull public final ExamType type; @@ -143,7 +135,7 @@ public final class Exam implements GrantEntity { public final Long lastModified; @JsonProperty(ATTR_ADDITIONAL_ATTRIBUTES) - private final Map additionalAttributes; + public final Map additionalAttributes; @JsonCreator public Exam( @@ -151,12 +143,10 @@ public final class Exam implements GrantEntity { @JsonProperty(EXAM.ATTR_INSTITUTION_ID) final Long institutionId, @JsonProperty(EXAM.ATTR_LMS_SETUP_ID) final Long lmsSetupId, @JsonProperty(EXAM.ATTR_EXTERNAL_ID) final String externalId, - @JsonProperty(ATTR_LMS_DATA_AVAILABLE) final Boolean lmsDataAvailable, - @JsonProperty(QuizData.QUIZ_ATTR_NAME) final String name, - @JsonProperty(QuizData.QUIZ_ATTR_DESCRIPTION) final String description, - @JsonProperty(QuizData.QUIZ_ATTR_START_TIME) final DateTime startTime, - @JsonProperty(QuizData.QUIZ_ATTR_END_TIME) final DateTime endTime, - @JsonProperty(QuizData.QUIZ_ATTR_START_URL) final String startURL, + @JsonProperty(EXAM.ATTR_LMS_AVAILABLE) final Boolean lmsAvailable, + @JsonProperty(EXAM.ATTR_QUIZ_NAME) final String name, + @JsonProperty(EXAM.ATTR_QUIZ_START_TIME) final DateTime startTime, + @JsonProperty(EXAM.ATTR_QUIZ_END_TIME) final DateTime endTime, @JsonProperty(EXAM.ATTR_TYPE) final ExamType type, @JsonProperty(EXAM.ATTR_OWNER) final String owner, @JsonProperty(EXAM.ATTR_SUPPORTER) final Collection supporter, @@ -173,12 +163,10 @@ public final class Exam implements GrantEntity { this.institutionId = institutionId; this.lmsSetupId = lmsSetupId; this.externalId = externalId; - this.lmsDataAvailable = lmsDataAvailable; + this.lmsAvailable = lmsAvailable; this.name = name; - this.description = description; this.startTime = startTime; this.endTime = endTime; - this.startURL = startURL; this.type = type; this.owner = owner; this.status = (status != null) ? status : getStatusFromDate(startTime, endTime); @@ -198,16 +186,18 @@ public final class Exam implements GrantEntity { public Exam(final String modelId, final QuizData quizData, final POSTMapper mapper) { + final Map additionalAttributes = new HashMap<>(quizData.getAdditionalAttributes()); + additionalAttributes.put(QuizData.QUIZ_ATTR_DESCRIPTION, quizData.description); + additionalAttributes.put(QuizData.QUIZ_ATTR_START_URL, quizData.startURL); + this.id = (modelId != null) ? Long.parseLong(modelId) : null; this.institutionId = quizData.institutionId; this.lmsSetupId = quizData.lmsSetupId; this.externalId = quizData.id; - this.lmsDataAvailable = true; + this.lmsAvailable = true; this.name = quizData.name; - this.description = quizData.description; this.startTime = quizData.startTime; this.endTime = quizData.endTime; - this.startURL = quizData.startURL; this.type = mapper.getEnum(EXAM.ATTR_TYPE, ExamType.class, ExamType.UNDEFINED); this.owner = mapper.getString(EXAM.ATTR_OWNER); this.status = mapper.getEnum( @@ -221,7 +211,8 @@ public final class Exam implements GrantEntity { this.lastUpdate = null; this.examTemplateId = mapper.getLong(EXAM.ATTR_EXAM_TEMPLATE_ID); this.lastModified = null; - this.additionalAttributes = null; + this.additionalAttributes = Utils.immutableMapOf(additionalAttributes); + } public Exam(final QuizData quizData) { @@ -233,12 +224,12 @@ public final class Exam implements GrantEntity { this.institutionId = null; this.lmsSetupId = null; this.externalId = null; - this.lmsDataAvailable = true; + this.lmsAvailable = true; this.name = null; - this.description = null; +// this.description = null; this.startTime = null; this.endTime = null; - this.startURL = null; +// this.startURL = null; this.type = null; this.owner = null; this.status = (status != null) ? status : getStatusFromDate(this.startTime, this.endTime); @@ -302,6 +293,10 @@ public final class Exam implements GrantEntity { return this.lmsSetupId; } + public Boolean getLmsAvailable() { + return this.lmsAvailable; + } + public String getExternalId() { return this.externalId; } @@ -320,7 +315,7 @@ public final class Exam implements GrantEntity { } public String getDescription() { - return this.description; + return this.getAdditionalAttribute(QuizData.QUIZ_ATTR_DESCRIPTION); } public DateTime getStartTime() { @@ -332,7 +327,7 @@ public final class Exam implements GrantEntity { } public String getStartURL() { - return this.startURL; + return this.getAdditionalAttribute(QuizData.QUIZ_ATTR_START_URL); } public ExamStatus getStatus() { @@ -381,13 +376,13 @@ public final class Exam implements GrantEntity { builder.append(", name="); builder.append(this.name); builder.append(", description="); - builder.append(this.description); + builder.append(this.getDescription()); builder.append(", startTime="); builder.append(this.startTime); builder.append(", endTime="); builder.append(this.endTime); builder.append(", startURL="); - builder.append(this.startURL); + builder.append(this.getStartURL()); builder.append(", type="); builder.append(this.type); builder.append(", owner="); diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamConfigurationMap.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamConfigurationMap.java index 783747b8..b870871c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamConfigurationMap.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamConfigurationMap.java @@ -311,7 +311,8 @@ public final class ExamConfigurationMap implements GrantEntity { public static ExamConfigurationMap createNew(final Exam exam) { return new ExamConfigurationMap( - null, exam.institutionId, exam.id, exam.name, exam.description, exam.startTime, exam.type, exam.status, + null, exam.institutionId, exam.id, exam.name, exam.getDescription(), exam.startTime, exam.type, + exam.status, null, null, null, null, null, null, null); } diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/RunningExamInfo.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/RunningExamInfo.java index 627029bd..4d795bf0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/RunningExamInfo.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/RunningExamInfo.java @@ -46,7 +46,7 @@ public final class RunningExamInfo { public RunningExamInfo(final Exam exam, final LmsType lmsType) { this.examId = exam.getModelId(); this.name = exam.name; - this.url = exam.startURL; + this.url = exam.getStartURL(); this.lmsType = (lmsType == null) ? "" : lmsType.name(); } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamForm.java index 175dd8cb..c1906f62 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamForm.java @@ -316,7 +316,7 @@ public class ExamForm implements TemplateComposer { .addField(FormBuilder.text( QuizData.QUIZ_ATTR_START_URL, FORM_QUIZ_URL_TEXT_KEY, - exam.startURL) + exam.getStartURL()) .readonly(true) .withInputSpan(7) .withEmptyCellSeparation(false)) @@ -324,7 +324,7 @@ public class ExamForm implements TemplateComposer { .addField(FormBuilder.text( QuizData.QUIZ_ATTR_DESCRIPTION, FORM_DESCRIPTION_TEXT_KEY, - exam.description) + exam.getDescription()) .asHTML(50) .readonly(true) .withInputSpan(6) @@ -577,7 +577,7 @@ public class ExamForm implements TemplateComposer { } private boolean testSEBRestrictionAPI(final Exam exam) { - if (exam.status == ExamStatus.CORRUPT_NO_LMS_CONNECTION || exam.status == ExamStatus.CORRUPT_INVALID_ID) { + if (!exam.lmsAvailable) { return false; } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamList.java index 06c48ad5..7c54401b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamList.java @@ -259,7 +259,7 @@ public class ExamList implements TemplateComposer { final Exam exam, final PageService pageService) { - if (BooleanUtils.isFalse(exam.lmsDataAvailable)) { + if (BooleanUtils.isFalse(exam.lmsAvailable)) { item.setData(RWT.CUSTOM_VARIANT, CustomVariant.DISABLED.key); return; } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/SEBClientEventDetailsPopup.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/SEBClientEventDetailsPopup.java index 3659b9de..32b306a1 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/SEBClientEventDetailsPopup.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/SEBClientEventDetailsPopup.java @@ -215,7 +215,7 @@ public class SEBClientEventDetailsPopup { .addField(FormBuilder.text( QuizData.QUIZ_ATTR_DESCRIPTION, FORM_DESC_TEXT_KEY, - exam.description) + exam.getDescription()) .asArea() .asHTML(true)) .addField(FormBuilder.text( 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 b1f53c4b..a4085f45 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-05-12T16:13:18.337+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+02:00", comments="Source Table: additional_attributes") public static final AdditionalAttributeRecord additionalAttributeRecord = new AdditionalAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.337+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.440+02:00", comments="Source field: additional_attributes.id") public static final SqlColumn id = additionalAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.337+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.440+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-05-12T16:13:18.337+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.440+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-05-12T16:13:18.337+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.440+02:00", comments="Source field: additional_attributes.name") public static final SqlColumn name = additionalAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.337+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.440+02:00", comments="Source field: additional_attributes.value") public static final SqlColumn value = additionalAttributeRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.337+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+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 6fa3ee31..6c61db61 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-05-12T16:13:18.337+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.440+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-05-12T16:13:18.337+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.440+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.441+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-05-12T16:13:18.338+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.442+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 ddfb210a..6ca5256a 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,37 +6,37 @@ 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-05-12T16:13:18.355+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source Table: batch_action") public static final BatchActionRecord batchActionRecord = new BatchActionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.355+02:00", comments="Source field: batch_action.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+02:00", comments="Source field: batch_action.id") public static final SqlColumn id = batchActionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.355+02:00", comments="Source field: batch_action.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+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-05-12T16:13:18.355+02:00", comments="Source field: batch_action.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+02:00", comments="Source field: batch_action.owner") public static final SqlColumn owner = batchActionRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.355+02:00", comments="Source field: batch_action.action_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+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-05-12T16:13:18.355+02:00", comments="Source field: batch_action.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+02:00", comments="Source field: batch_action.attributes") public static final SqlColumn attributes = batchActionRecord.attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.355+02:00", comments="Source field: batch_action.source_ids") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+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-05-12T16:13:18.355+02:00", comments="Source field: batch_action.successful") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+02:00", comments="Source field: batch_action.successful") public static final SqlColumn successful = batchActionRecord.successful; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.355+02:00", comments="Source field: batch_action.last_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+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-05-12T16:13:18.355+02:00", comments="Source field: batch_action.processor_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+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-05-12T16:13:18.355+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source Table: batch_action") public static final class BatchActionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); 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 e2eea8e4..813ab5aa 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,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface BatchActionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.355+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+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-05-12T16:13:18.355+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+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-05-12T16:13:18.355+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+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-05-12T16:13:18.355+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+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), @@ -60,7 +60,7 @@ public interface BatchActionRecordMapper { }) BatchActionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.454+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), @@ -75,22 +75,22 @@ public interface BatchActionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+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-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+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-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+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-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+02:00", comments="Source Table: batch_action") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, batchActionRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface BatchActionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+02:00", comments="Source Table: batch_action") default int insert(BatchActionRecord record) { return insert(SqlBuilder.insert(record) .into(batchActionRecord) @@ -114,7 +114,7 @@ public interface BatchActionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+02:00", comments="Source Table: batch_action") default int insertSelective(BatchActionRecord record) { return insert(SqlBuilder.insert(record) .into(batchActionRecord) @@ -130,19 +130,19 @@ public interface BatchActionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+02:00", comments="Source Table: batch_action") default QueryExpressionDSL>> selectByExample() { 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-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+02:00", comments="Source Table: batch_action") default QueryExpressionDSL>> selectDistinctByExample() { 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-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+02:00", comments="Source Table: batch_action") default BatchActionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, actionType, attributes, sourceIds, successful, lastUpdate, processorId) .from(batchActionRecord) @@ -151,7 +151,7 @@ public interface BatchActionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+02:00", comments="Source Table: batch_action") default UpdateDSL> updateByExample(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -164,7 +164,7 @@ public interface BatchActionRecordMapper { .set(processorId).equalTo(record::getProcessorId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+02:00", comments="Source Table: batch_action") default UpdateDSL> updateByExampleSelective(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -177,7 +177,7 @@ public interface BatchActionRecordMapper { .set(processorId).equalToWhenPresent(record::getProcessorId); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+02:00", comments="Source Table: batch_action") default int updateByPrimaryKey(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -193,7 +193,7 @@ public interface BatchActionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.356+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.455+02:00", comments="Source Table: batch_action") default int updateByPrimaryKeySelective(BatchActionRecord record) { return UpdateDSL.updateWithMapper(this::update, batchActionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) 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 570d16d3..0dcd51eb 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-05-12T16:13:18.346+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+02:00", comments="Source Table: certificate") public static final CertificateRecord certificateRecord = new CertificateRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.346+02:00", comments="Source field: certificate.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+02:00", comments="Source field: certificate.id") public static final SqlColumn id = certificateRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.346+02:00", comments="Source field: certificate.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+02:00", comments="Source field: certificate.institution_id") public static final SqlColumn institutionId = certificateRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.346+02:00", comments="Source field: certificate.aliases") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+02:00", comments="Source field: certificate.aliases") public static final SqlColumn aliases = certificateRecord.aliases; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.346+02:00", comments="Source field: certificate.cert_store") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+02:00", comments="Source field: certificate.cert_store") public static final SqlColumn certStore = certificateRecord.certStore; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.346+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+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 a9708366..acf4daa3 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-05-12T16:13:18.346+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+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-05-12T16:13:18.346+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+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-05-12T16:13:18.346+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+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-05-12T16:13:18.346+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+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-05-12T16:13:18.346+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+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-05-12T16:13:18.346+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+02:00", comments="Source Table: certificate") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, certificateRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.447+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.448+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.448+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.448+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.448+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.448+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.448+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.448+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-05-12T16:13:18.347+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.448+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 0db6de6a..821d561c 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-05-12T16:13:18.260+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.372+02:00", comments="Source Table: client_connection") public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.261+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.372+02:00", comments="Source field: client_connection.id") public static final SqlColumn id = clientConnectionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.261+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.372+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-05-12T16:13:18.261+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.373+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-05-12T16:13:18.261+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.373+02:00", comments="Source field: client_connection.status") public static final SqlColumn status = clientConnectionRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.261+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.373+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-05-12T16:13:18.261+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.373+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-05-12T16:13:18.261+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.373+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-05-12T16:13:18.261+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.373+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-05-12T16:13:18.261+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.373+02:00", comments="Source field: client_connection.vdi") public static final SqlColumn vdi = clientConnectionRecord.vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.262+02:00", comments="Source field: client_connection.vdi_pair_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.374+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-05-12T16:13:18.262+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.374+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-05-12T16:13:18.262+02:00", comments="Source field: client_connection.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.374+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-05-12T16:13:18.262+02:00", comments="Source field: client_connection.remote_proctoring_room_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.374+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-05-12T16:13:18.262+02:00", comments="Source field: client_connection.remote_proctoring_room_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.374+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-05-12T16:13:18.262+02:00", comments="Source field: client_connection.client_machine_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.374+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-05-12T16:13:18.262+02:00", comments="Source field: client_connection.client_os_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.374+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-05-12T16:13:18.262+02:00", comments="Source field: client_connection.client_version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.374+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-05-12T16:13:18.261+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.372+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 884de6f1..e6c1f0b5 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-05-12T16:13:18.262+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.374+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-05-12T16:13:18.262+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.262+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.262+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.375+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.376+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.376+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.376+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-05-12T16:13:18.264+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.376+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-05-12T16:13:18.265+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.377+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 43828f50..206eeb28 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-05-12T16:13:18.275+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.387+02:00", comments="Source Table: client_event") public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.275+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+02:00", comments="Source field: client_event.id") public static final SqlColumn id = clientEventRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.275+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+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-05-12T16:13:18.275+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+02:00", comments="Source field: client_event.type") public static final SqlColumn type = clientEventRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.275+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+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-05-12T16:13:18.276+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+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-05-12T16:13:18.276+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+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-05-12T16:13:18.276+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+02:00", comments="Source field: client_event.text") public static final SqlColumn text = clientEventRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.275+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.387+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 98d5e34d..829728f1 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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.388+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.276+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.277+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.277+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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-05-12T16:13:18.277+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.389+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 9f231c9f..d0756da7 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-05-12T16:13:18.359+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+02:00", comments="Source Table: client_indicator") public static final ClientIndicatorRecord clientIndicatorRecord = new ClientIndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.359+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+02:00", comments="Source field: client_indicator.id") public static final SqlColumn id = clientIndicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.359+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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-05-12T16:13:18.360+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+02:00", comments="Source field: client_indicator.type") public static final SqlColumn type = clientIndicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.360+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+02:00", comments="Source field: client_indicator.value") public static final SqlColumn value = clientIndicatorRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.359+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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 c2d67b75..da7cd95c 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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.458+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.458+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.458+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.458+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-05-12T16:13:18.360+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.458+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-05-12T16:13:18.361+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.458+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-05-12T16:13:18.361+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.458+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-05-12T16:13:18.361+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.458+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-05-12T16:13:18.361+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.458+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-05-12T16:13:18.361+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.458+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 d2690961..c3061eba 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-05-12T16:13:18.283+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source Table: client_instruction") public static final ClientInstructionRecord clientInstructionRecord = new ClientInstructionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.283+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.392+02:00", comments="Source field: client_instruction.id") public static final SqlColumn id = clientInstructionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.283+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.392+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-05-12T16:13:18.283+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.392+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-05-12T16:13:18.283+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.392+02:00", comments="Source field: client_instruction.type") public static final SqlColumn type = clientInstructionRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.283+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.393+02:00", comments="Source field: client_instruction.attributes") public static final SqlColumn attributes = clientInstructionRecord.attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.283+02:00", comments="Source field: client_instruction.needs_confirmation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.393+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-05-12T16:13:18.283+02:00", comments="Source field: client_instruction.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.393+02:00", comments="Source field: client_instruction.timestamp") public static final SqlColumn timestamp = clientInstructionRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.283+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.392+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 94710857..0e6111c8 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-05-12T16:13:18.283+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.393+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-05-12T16:13:18.283+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.393+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-05-12T16:13:18.283+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.393+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-05-12T16:13:18.283+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.393+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.393+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.394+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.394+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.394+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.394+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.394+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.395+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.395+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.395+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.395+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.395+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.395+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-05-12T16:13:18.284+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.395+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-05-12T16:13:18.285+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.395+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 134be96b..88178df1 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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+02:00", comments="Source Table: client_notification") public static final ClientNotificationRecord clientNotificationRecord = new ClientNotificationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.365+02:00", comments="Source field: client_notification.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+02:00", comments="Source field: client_notification.id") public static final SqlColumn id = clientNotificationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.365+02:00", comments="Source field: client_notification.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source field: client_notification.event_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source field: client_notification.notification_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source field: client_notification.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+02:00", comments="Source field: client_notification.value") public static final SqlColumn value = clientNotificationRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.365+02:00", comments="Source field: client_notification.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+02:00", comments="Source field: client_notification.text") public static final SqlColumn text = clientNotificationRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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 00f30f69..d6a68494 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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.460+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.461+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.461+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-05-12T16:13:18.365+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.461+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-05-12T16:13:18.366+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.461+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-05-12T16:13:18.366+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.461+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-05-12T16:13:18.366+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.461+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-05-12T16:13:18.366+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.461+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-05-12T16:13:18.366+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.461+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 a93b4aa1..2e71975f 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-05-12T16:13:17.976+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.155+02:00", comments="Source Table: configuration_attribute") public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.979+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.157+02:00", comments="Source field: configuration_attribute.id") public static final SqlColumn id = configurationAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.980+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.157+02:00", comments="Source field: configuration_attribute.name") public static final SqlColumn name = configurationAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.981+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.158+02:00", comments="Source field: configuration_attribute.type") public static final SqlColumn type = configurationAttributeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.981+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.158+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-05-12T16:13:17.981+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.158+02:00", comments="Source field: configuration_attribute.resources") public static final SqlColumn resources = configurationAttributeRecord.resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.982+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.158+02:00", comments="Source field: configuration_attribute.validator") public static final SqlColumn validator = configurationAttributeRecord.validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.982+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.158+02:00", comments="Source field: configuration_attribute.dependencies") public static final SqlColumn dependencies = configurationAttributeRecord.dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.982+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.158+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-05-12T16:13:17.979+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.156+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 eeddb8bf..99483c68 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-05-12T16:13:17.984+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.159+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-05-12T16:13:17.987+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.160+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-05-12T16:13:17.988+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.161+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-05-12T16:13:17.990+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.162+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-05-12T16:13:17.991+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.163+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-05-12T16:13:17.992+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.164+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-05-12T16:13:17.993+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.164+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-05-12T16:13:17.993+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.165+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-05-12T16:13:17.994+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.166+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-05-12T16:13:17.995+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.167+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-05-12T16:13:17.997+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.168+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-05-12T16:13:17.999+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.169+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-05-12T16:13:18.001+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.169+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-05-12T16:13:18.003+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.170+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-05-12T16:13:18.004+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.171+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-05-12T16:13:18.005+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.172+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-05-12T16:13:18.006+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.172+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-05-12T16:13:18.007+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.173+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 ad642e1a..2927c906 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,40 +6,40 @@ 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-05-12T16:13:18.232+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.344+02:00", comments="Source Table: configuration_node") public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.232+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.344+02:00", comments="Source field: configuration_node.id") public static final SqlColumn id = configurationNodeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.232+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.344+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-05-12T16:13:18.232+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.344+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-05-12T16:13:18.232+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.345+02:00", comments="Source field: configuration_node.owner") public static final SqlColumn owner = configurationNodeRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.232+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.345+02:00", comments="Source field: configuration_node.name") public static final SqlColumn name = configurationNodeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.233+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.345+02:00", comments="Source field: configuration_node.description") public static final SqlColumn description = configurationNodeRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.233+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.345+02:00", comments="Source field: configuration_node.type") public static final SqlColumn type = configurationNodeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.233+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.345+02:00", comments="Source field: configuration_node.status") public static final SqlColumn status = configurationNodeRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.233+02:00", comments="Source field: configuration_node.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.345+02:00", comments="Source field: configuration_node.last_update_time") public static final SqlColumn lastUpdateTime = configurationNodeRecord.lastUpdateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.233+02:00", comments="Source field: configuration_node.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+02:00", comments="Source field: configuration_node.last_update_user") public static final SqlColumn lastUpdateUser = configurationNodeRecord.lastUpdateUser; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.232+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.344+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 c1a5e499..d9450147 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-05-12T16:13:18.233+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+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-05-12T16:13:18.233+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+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-05-12T16:13:18.233+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+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-05-12T16:13:18.233+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+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), @@ -61,7 +61,7 @@ public interface ConfigurationNodeRecordMapper { }) ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.234+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+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), @@ -77,22 +77,22 @@ public interface ConfigurationNodeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.234+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+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-05-12T16:13:18.234+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+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-05-12T16:13:18.234+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+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-05-12T16:13:18.234+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+02:00", comments="Source Table: configuration_node") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.234+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+02:00", comments="Source Table: configuration_node") default int insert(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -117,7 +117,7 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.234+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.346+02:00", comments="Source Table: configuration_node") default int insertSelective(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -134,19 +134,19 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.234+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.347+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status, lastUpdateTime, lastUpdateUser) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.234+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.347+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status, lastUpdateTime, lastUpdateUser) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.235+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.347+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, lastUpdateTime, lastUpdateUser) .from(configurationNodeRecord) @@ -155,7 +155,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.235+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.347+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExample(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -169,7 +169,7 @@ public interface ConfigurationNodeRecordMapper { .set(lastUpdateUser).equalTo(record::getLastUpdateUser); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.235+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.347+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExampleSelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -183,7 +183,7 @@ public interface ConfigurationNodeRecordMapper { .set(lastUpdateUser).equalToWhenPresent(record::getLastUpdateUser); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.235+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.347+02:00", comments="Source Table: configuration_node") default int updateByPrimaryKey(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -200,7 +200,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.235+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.347+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 53531c78..5c8f3337 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-05-12T16:13:18.222+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.338+02:00", comments="Source Table: configuration") public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.223+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.338+02:00", comments="Source field: configuration.id") public static final SqlColumn id = configurationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.223+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.338+02:00", comments="Source field: configuration.institution_id") public static final SqlColumn institutionId = configurationRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.223+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.338+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-05-12T16:13:18.223+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.339+02:00", comments="Source field: configuration.version") public static final SqlColumn version = configurationRecord.version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.223+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.339+02:00", comments="Source field: configuration.version_date") public static final SqlColumn versionDate = configurationRecord.versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.224+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.339+02:00", comments="Source field: configuration.followup") public static final SqlColumn followup = configurationRecord.followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.223+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.338+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 a0adf27f..ddc6a19e 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-05-12T16:13:18.224+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.339+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-05-12T16:13:18.224+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.339+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-05-12T16:13:18.224+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.339+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-05-12T16:13:18.224+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.339+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-05-12T16:13:18.224+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.340+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-05-12T16:13:18.225+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.340+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-05-12T16:13:18.225+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.340+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-05-12T16:13:18.225+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.340+02:00", comments="Source Table: configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.225+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.340+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-05-12T16:13:18.225+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.340+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-05-12T16:13:18.225+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.340+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-05-12T16:13:18.225+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.340+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-05-12T16:13:18.225+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.340+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-05-12T16:13:18.226+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.340+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-05-12T16:13:18.226+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.341+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-05-12T16:13:18.226+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.341+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-05-12T16:13:18.226+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.341+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-05-12T16:13:18.226+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.341+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 68998df9..b2c4b872 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-05-12T16:13:18.199+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.319+02:00", comments="Source Table: configuration_value") public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.199+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.320+02:00", comments="Source field: configuration_value.id") public static final SqlColumn id = configurationValueRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.200+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.320+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-05-12T16:13:18.200+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.320+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-05-12T16:13:18.200+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.320+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-05-12T16:13:18.200+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.321+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-05-12T16:13:18.200+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.321+02:00", comments="Source field: configuration_value.value") public static final SqlColumn value = configurationValueRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.199+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.320+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 460d918b..6cea1c4c 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-05-12T16:13:18.200+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.321+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-05-12T16:13:18.201+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.321+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-05-12T16:13:18.201+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.321+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-05-12T16:13:18.201+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.321+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-05-12T16:13:18.201+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.321+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-05-12T16:13:18.201+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.322+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-05-12T16:13:18.201+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.322+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-05-12T16:13:18.201+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.322+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-05-12T16:13:18.201+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.322+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-05-12T16:13:18.201+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.322+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-05-12T16:13:18.201+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.322+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-05-12T16:13:18.202+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.322+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-05-12T16:13:18.202+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.322+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-05-12T16:13:18.202+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.322+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-05-12T16:13:18.202+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.322+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-05-12T16:13:18.202+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.323+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-05-12T16:13:18.202+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.323+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-05-12T16:13:18.202+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.323+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 223f518a..5eb955cb 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-05-12T16:13:18.239+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.354+02:00", comments="Source Table: exam_configuration_map") public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.239+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.355+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-05-12T16:13:18.239+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.355+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-05-12T16:13:18.240+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.355+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-05-12T16:13:18.240+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.355+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-05-12T16:13:18.240+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.355+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-05-12T16:13:18.240+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.355+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-05-12T16:13:18.239+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.354+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 250893d6..4f65fc02 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-05-12T16:13:18.240+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.240+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.240+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.240+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.240+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.240+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.241+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.241+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.241+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.241+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.241+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.241+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.356+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-05-12T16:13:18.241+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.357+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-05-12T16:13:18.241+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.358+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-05-12T16:13:18.242+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.358+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-05-12T16:13:18.242+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.358+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-05-12T16:13:18.242+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.358+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-05-12T16:13:18.242+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.358+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 4040113a..49c013c9 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 @@ -2,62 +2,75 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; +import org.joda.time.DateTime; 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-05-12T16:13:18.248+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source Table: exam") public static final ExamRecord examRecord = new ExamRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.248+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.362+02:00", comments="Source field: exam.id") public static final SqlColumn id = examRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.249+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.362+02:00", comments="Source field: exam.institution_id") public static final SqlColumn institutionId = examRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.249+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.362+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-05-12T16:13:18.249+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.362+02:00", comments="Source field: exam.external_id") public static final SqlColumn externalId = examRecord.externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.249+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.362+02:00", comments="Source field: exam.owner") public static final SqlColumn owner = examRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.249+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.362+02:00", comments="Source field: exam.supporter") public static final SqlColumn supporter = examRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.249+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.362+02:00", comments="Source field: exam.type") public static final SqlColumn type = examRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.249+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.362+02:00", comments="Source field: exam.quit_password") public static final SqlColumn quitPassword = examRecord.quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.249+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.362+02:00", comments="Source field: exam.browser_keys") public static final SqlColumn browserKeys = examRecord.browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.250+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.363+02:00", comments="Source field: exam.status") public static final SqlColumn status = examRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.250+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.363+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-05-12T16:13:18.250+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.363+02:00", comments="Source field: exam.updating") public static final SqlColumn updating = examRecord.updating; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.250+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.363+02:00", comments="Source field: exam.lastupdate") public static final SqlColumn lastupdate = examRecord.lastupdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.250+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.363+02:00", comments="Source field: exam.active") public static final SqlColumn active = examRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.250+02:00", comments="Source field: exam.exam_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.363+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-05-12T16:13:18.250+02:00", comments="Source field: exam.last_modified") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.363+02:00", comments="Source field: exam.last_modified") public static final SqlColumn lastModified = examRecord.lastModified; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.248+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.363+02:00", comments="Source field: exam.quiz_name") + public static final SqlColumn quizName = examRecord.quizName; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.363+02:00", comments="Source field: exam.quiz_start_time") + public static final SqlColumn quizStartTime = examRecord.quizStartTime; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.364+02:00", comments="Source field: exam.quiz_end_time") + public static final SqlColumn quizEndTime = examRecord.quizEndTime; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.364+02:00", comments="Source field: exam.lms_available") + public static final SqlColumn lmsAvailable = examRecord.lmsAvailable; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source Table: exam") public static final class ExamRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); @@ -91,6 +104,14 @@ public final class ExamRecordDynamicSqlSupport { public final SqlColumn lastModified = column("last_modified", JDBCType.BIGINT); + public final SqlColumn quizName = column("quiz_name", JDBCType.VARCHAR); + + public final SqlColumn quizStartTime = column("quiz_start_time", JDBCType.TIMESTAMP, "ch.ethz.seb.sebserver.webservice.datalayer.batis.JodaTimeTypeResolver"); + + public final SqlColumn quizEndTime = column("quiz_end_time", JDBCType.TIMESTAMP, "ch.ethz.seb.sebserver.webservice.datalayer.batis.JodaTimeTypeResolver"); + + public final SqlColumn lmsAvailable = column("lms_available", JDBCType.INTEGER); + public ExamRecord() { super("exam"); } 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 9d5b40ea..faf30edc 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 @@ -3,6 +3,7 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper; import static ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ExamRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.JodaTimeTypeResolver; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ExamRecord; import java.util.List; import javax.annotation.Generated; @@ -15,6 +16,7 @@ import org.apache.ibatis.annotations.SelectKey; import org.apache.ibatis.annotations.SelectProvider; import org.apache.ibatis.annotations.UpdateProvider; import org.apache.ibatis.type.JdbcType; +import org.joda.time.DateTime; import org.mybatis.dynamic.sql.SqlBuilder; import org.mybatis.dynamic.sql.delete.DeleteDSL; import org.mybatis.dynamic.sql.delete.MyBatis3DeleteModelAdapter; @@ -32,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.364+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-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.364+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-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.364+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-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.364+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -63,11 +65,15 @@ public interface ExamRecordMapper { @Arg(column="lastupdate", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER), @Arg(column="exam_template_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), - @Arg(column="last_modified", javaType=Long.class, jdbcType=JdbcType.BIGINT) + @Arg(column="last_modified", javaType=Long.class, jdbcType=JdbcType.BIGINT), + @Arg(column="quiz_name", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="quiz_start_time", javaType=DateTime.class, typeHandler=JodaTimeTypeResolver.class, jdbcType=JdbcType.TIMESTAMP), + @Arg(column="quiz_end_time", javaType=DateTime.class, typeHandler=JodaTimeTypeResolver.class, jdbcType=JdbcType.TIMESTAMP), + @Arg(column="lms_available", javaType=Integer.class, jdbcType=JdbcType.INTEGER) }) ExamRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.364+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -85,26 +91,30 @@ public interface ExamRecordMapper { @Arg(column="lastupdate", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER), @Arg(column="exam_template_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), - @Arg(column="last_modified", javaType=Long.class, jdbcType=JdbcType.BIGINT) + @Arg(column="last_modified", javaType=Long.class, jdbcType=JdbcType.BIGINT), + @Arg(column="quiz_name", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="quiz_start_time", javaType=DateTime.class, typeHandler=JodaTimeTypeResolver.class, jdbcType=JdbcType.TIMESTAMP), + @Arg(column="quiz_end_time", javaType=DateTime.class, typeHandler=JodaTimeTypeResolver.class, jdbcType=JdbcType.TIMESTAMP), + @Arg(column="lms_available", javaType=Integer.class, jdbcType=JdbcType.INTEGER) }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.364+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-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.364+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-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.364+02:00", comments="Source Table: exam") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.365+02:00", comments="Source Table: exam") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord) .where(id, isEqualTo(id_)) @@ -112,7 +122,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.365+02:00", comments="Source Table: exam") default int insert(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -131,11 +141,15 @@ public interface ExamRecordMapper { .map(active).toProperty("active") .map(examTemplateId).toProperty("examTemplateId") .map(lastModified).toProperty("lastModified") + .map(quizName).toProperty("quizName") + .map(quizStartTime).toProperty("quizStartTime") + .map(quizEndTime).toProperty("quizEndTime") + .map(lmsAvailable).toProperty("lmsAvailable") .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.365+02:00", comments="Source Table: exam") default int insertSelective(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -154,32 +168,36 @@ public interface ExamRecordMapper { .map(active).toPropertyWhenPresent("active", record::getActive) .map(examTemplateId).toPropertyWhenPresent("examTemplateId", record::getExamTemplateId) .map(lastModified).toPropertyWhenPresent("lastModified", record::getLastModified) + .map(quizName).toPropertyWhenPresent("quizName", record::getQuizName) + .map(quizStartTime).toPropertyWhenPresent("quizStartTime", record::getQuizStartTime) + .map(quizEndTime).toPropertyWhenPresent("quizEndTime", record::getQuizEndTime) + .map(lmsAvailable).toPropertyWhenPresent("lmsAvailable", record::getLmsAvailable) .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.251+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.365+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) + return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active, examTemplateId, lastModified, quizName, quizStartTime, quizEndTime, lmsAvailable) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.252+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.365+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) + return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active, examTemplateId, lastModified, quizName, quizStartTime, quizEndTime, lmsAvailable) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.252+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.365+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) + return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active, examTemplateId, lastModified, quizName, quizStartTime, quizEndTime, lmsAvailable) .from(examRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.252+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.365+02:00", comments="Source Table: exam") default UpdateDSL> updateByExample(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -196,10 +214,14 @@ public interface ExamRecordMapper { .set(lastupdate).equalTo(record::getLastupdate) .set(active).equalTo(record::getActive) .set(examTemplateId).equalTo(record::getExamTemplateId) - .set(lastModified).equalTo(record::getLastModified); + .set(lastModified).equalTo(record::getLastModified) + .set(quizName).equalTo(record::getQuizName) + .set(quizStartTime).equalTo(record::getQuizStartTime) + .set(quizEndTime).equalTo(record::getQuizEndTime) + .set(lmsAvailable).equalTo(record::getLmsAvailable); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.252+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.365+02:00", comments="Source Table: exam") default UpdateDSL> updateByExampleSelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -216,10 +238,14 @@ public interface ExamRecordMapper { .set(lastupdate).equalToWhenPresent(record::getLastupdate) .set(active).equalToWhenPresent(record::getActive) .set(examTemplateId).equalToWhenPresent(record::getExamTemplateId) - .set(lastModified).equalToWhenPresent(record::getLastModified); + .set(lastModified).equalToWhenPresent(record::getLastModified) + .set(quizName).equalToWhenPresent(record::getQuizName) + .set(quizStartTime).equalToWhenPresent(record::getQuizStartTime) + .set(quizEndTime).equalToWhenPresent(record::getQuizEndTime) + .set(lmsAvailable).equalToWhenPresent(record::getLmsAvailable); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.252+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.365+02:00", comments="Source Table: exam") default int updateByPrimaryKey(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -237,12 +263,16 @@ public interface ExamRecordMapper { .set(active).equalTo(record::getActive) .set(examTemplateId).equalTo(record::getExamTemplateId) .set(lastModified).equalTo(record::getLastModified) + .set(quizName).equalTo(record::getQuizName) + .set(quizStartTime).equalTo(record::getQuizStartTime) + .set(quizEndTime).equalTo(record::getQuizEndTime) + .set(lmsAvailable).equalTo(record::getLmsAvailable) .where(id, isEqualTo(record::getId)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.252+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.366+02:00", comments="Source Table: exam") default int updateByPrimaryKeySelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -260,6 +290,10 @@ public interface ExamRecordMapper { .set(active).equalToWhenPresent(record::getActive) .set(examTemplateId).equalToWhenPresent(record::getExamTemplateId) .set(lastModified).equalToWhenPresent(record::getLastModified) + .set(quizName).equalToWhenPresent(record::getQuizName) + .set(quizStartTime).equalToWhenPresent(record::getQuizStartTime) + .set(quizEndTime).equalToWhenPresent(record::getQuizEndTime) + .set(lmsAvailable).equalToWhenPresent(record::getLmsAvailable) .where(id, isEqualTo(record::getId)) .build() .execute(); 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 6a53b584..b2ad346c 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-05-12T16:13:18.350+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+02:00", comments="Source Table: exam_template") public static final ExamTemplateRecord examTemplateRecord = new ExamTemplateRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.350+02:00", comments="Source field: exam_template.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+02:00", comments="Source field: exam_template.id") public static final SqlColumn id = examTemplateRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.350+02:00", comments="Source field: exam_template.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+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-05-12T16:13:18.350+02:00", comments="Source field: exam_template.configuration_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+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-05-12T16:13:18.350+02:00", comments="Source field: exam_template.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+02:00", comments="Source field: exam_template.name") public static final SqlColumn name = examTemplateRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.350+02:00", comments="Source field: exam_template.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+02:00", comments="Source field: exam_template.description") public static final SqlColumn description = examTemplateRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.350+02:00", comments="Source field: exam_template.exam_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+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-05-12T16:13:18.350+02:00", comments="Source field: exam_template.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+02:00", comments="Source field: exam_template.supporter") public static final SqlColumn supporter = examTemplateRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.350+02:00", comments="Source field: exam_template.indicator_templates") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+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-05-12T16:13:18.351+02:00", comments="Source field: exam_template.institutional_default") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+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-05-12T16:13:18.350+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+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 1fbf0be1..ba43526f 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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.351+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.352+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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-05-12T16:13:18.352+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.452+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 e017926b..4e875ea6 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-05-12T16:13:18.286+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source Table: indicator") public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.287+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.399+02:00", comments="Source field: indicator.id") public static final SqlColumn id = indicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.287+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.399+02:00", comments="Source field: indicator.exam_id") public static final SqlColumn examId = indicatorRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.287+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.399+02:00", comments="Source field: indicator.type") public static final SqlColumn type = indicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.287+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.400+02:00", comments="Source field: indicator.name") public static final SqlColumn name = indicatorRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.287+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.400+02:00", comments="Source field: indicator.color") public static final SqlColumn color = indicatorRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.287+02:00", comments="Source field: indicator.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.401+02:00", comments="Source field: indicator.icon") public static final SqlColumn icon = indicatorRecord.icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.287+02:00", comments="Source field: indicator.tags") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+02:00", comments="Source field: indicator.tags") public static final SqlColumn tags = indicatorRecord.tags; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.399+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 0ce64826..f15464cb 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-05-12T16:13:18.287+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.287+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.287+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.287+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.287+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+02:00", comments="Source Table: indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.402+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.403+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.403+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.403+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.403+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.403+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-05-12T16:13:18.288+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.403+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 efb24f77..71ead775 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-05-12T16:13:18.294+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.413+02:00", comments="Source Table: institution") public static final InstitutionRecord institutionRecord = new InstitutionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.295+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.413+02:00", comments="Source field: institution.id") public static final SqlColumn id = institutionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.295+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.413+02:00", comments="Source field: institution.name") public static final SqlColumn name = institutionRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.295+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.413+02:00", comments="Source field: institution.url_suffix") public static final SqlColumn urlSuffix = institutionRecord.urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.295+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.413+02:00", comments="Source field: institution.theme_name") public static final SqlColumn themeName = institutionRecord.themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.295+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+02:00", comments="Source field: institution.active") public static final SqlColumn active = institutionRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.295+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+02:00", comments="Source field: institution.logo_image") public static final SqlColumn logoImage = institutionRecord.logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.295+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.413+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 33a46bc4..41cc8e4d 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-05-12T16:13:18.295+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.295+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.296+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.296+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.296+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.296+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.296+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.296+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+02:00", comments="Source Table: institution") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.296+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.296+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.296+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.297+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.297+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.297+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.297+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.297+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.297+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.414+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-05-12T16:13:18.297+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.415+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 27a01d36..5fa04cab 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-05-12T16:13:18.306+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+02:00", comments="Source Table: lms_setup") public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+02:00", comments="Source field: lms_setup.id") public static final SqlColumn id = lmsSetupRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+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-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+02:00", comments="Source field: lms_setup.name") public static final SqlColumn name = lmsSetupRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+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-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+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-05-12T16:13:18.307+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+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-05-12T16:13:18.307+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+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-05-12T16:13:18.307+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+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-05-12T16:13:18.307+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+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-05-12T16:13:18.307+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.307+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.307+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.307+02:00", comments="Source field: lms_setup.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.307+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+02:00", comments="Source field: lms_setup.active") public static final SqlColumn active = lmsSetupRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.306+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+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 e0943336..da1f8659 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-05-12T16:13:18.307+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.307+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.307+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.307+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.307+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.423+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.424+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.424+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.424+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.424+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.424+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.424+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-05-12T16:13:18.308+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.424+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 123fe6a4..404040de 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-05-12T16:13:18.213+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.332+02:00", comments="Source Table: orientation") public static final OrientationRecord orientationRecord = new OrientationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.214+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.332+02:00", comments="Source field: orientation.id") public static final SqlColumn id = orientationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.214+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.333+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-05-12T16:13:18.214+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.333+02:00", comments="Source field: orientation.template_id") public static final SqlColumn templateId = orientationRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.214+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.333+02:00", comments="Source field: orientation.view_id") public static final SqlColumn viewId = orientationRecord.viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.215+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.333+02:00", comments="Source field: orientation.group_id") public static final SqlColumn groupId = orientationRecord.groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.215+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.333+02:00", comments="Source field: orientation.x_position") public static final SqlColumn xPosition = orientationRecord.xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.215+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.333+02:00", comments="Source field: orientation.y_position") public static final SqlColumn yPosition = orientationRecord.yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.215+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.334+02:00", comments="Source field: orientation.width") public static final SqlColumn width = orientationRecord.width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.215+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.334+02:00", comments="Source field: orientation.height") public static final SqlColumn height = orientationRecord.height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.215+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.334+02:00", comments="Source field: orientation.title") public static final SqlColumn title = orientationRecord.title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.214+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.332+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 4f6b12a5..cc29b865 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-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.334+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-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.334+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-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.334+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-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.334+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-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.334+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-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.335+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-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.335+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-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.335+02:00", comments="Source Table: orientation") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.335+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-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.335+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-05-12T16:13:18.216+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.335+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-05-12T16:13:18.217+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.335+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-05-12T16:13:18.217+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.335+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-05-12T16:13:18.217+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.336+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-05-12T16:13:18.217+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.336+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-05-12T16:13:18.217+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.336+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-05-12T16:13:18.217+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.336+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-05-12T16:13:18.217+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.336+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 33d0dfef..fec8d832 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-05-12T16:13:18.269+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.380+02:00", comments="Source Table: remote_proctoring_room") public static final RemoteProctoringRoomRecord remoteProctoringRoomRecord = new RemoteProctoringRoomRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.381+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-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.381+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-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.381+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-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.size") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.381+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-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.subject") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.381+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-05-12T16:13:18.270+02:00", comments="Source field: remote_proctoring_room.townhall_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.381+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-05-12T16:13:18.270+02:00", comments="Source field: remote_proctoring_room.break_out_connections") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.381+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-05-12T16:13:18.270+02:00", comments="Source field: remote_proctoring_room.join_key") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.382+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-05-12T16:13:18.270+02:00", comments="Source field: remote_proctoring_room.room_data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.382+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-05-12T16:13:18.269+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.381+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 e5948d90..afd84ba8 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-05-12T16:13:18.270+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.382+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-05-12T16:13:18.270+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.382+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-05-12T16:13:18.270+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.382+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-05-12T16:13:18.270+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.383+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-05-12T16:13:18.270+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.383+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-05-12T16:13:18.270+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.383+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-05-12T16:13:18.270+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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-05-12T16:13:18.271+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.384+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 68d831ec..794a683f 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-05-12T16:13:18.325+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.429+02:00", comments="Source Table: user_role") public static final RoleRecord roleRecord = new RoleRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.325+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+02:00", comments="Source field: user_role.id") public static final SqlColumn id = roleRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.328+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.325+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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 987016b0..ddc3a1ab 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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.430+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-05-12T16:13:18.328+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.431+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-05-12T16:13:18.329+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.431+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-05-12T16:13:18.329+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.431+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-05-12T16:13:18.329+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.431+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-05-12T16:13:18.329+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.431+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 a71ca54c..7a8516ca 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,40 +7,40 @@ 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-05-12T16:13:18.300+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source Table: seb_client_configuration") public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+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-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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-05-12T16:13:18.301+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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-05-12T16:13:18.301+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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-05-12T16:13:18.301+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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-05-12T16:13:18.301+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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-05-12T16:13:18.301+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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-05-12T16:13:18.301+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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-05-12T16:13:18.301+02:00", comments="Source field: seb_client_configuration.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+02:00", comments="Source field: seb_client_configuration.last_update_time") public static final SqlColumn lastUpdateTime = sebClientConfigRecord.lastUpdateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.301+02:00", comments="Source field: seb_client_configuration.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+02:00", comments="Source field: seb_client_configuration.last_update_user") public static final SqlColumn lastUpdateUser = sebClientConfigRecord.lastUpdateUser; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+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 88ea10cc..89a2e87e 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-05-12T16:13:18.301+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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-05-12T16:13:18.301+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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-05-12T16:13:18.301+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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-05-12T16:13:18.301+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.419+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), @@ -63,7 +63,7 @@ public interface SebClientConfigRecordMapper { }) SebClientConfigRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.301+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+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), @@ -79,22 +79,22 @@ public interface SebClientConfigRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+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-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+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-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+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-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+02:00", comments="Source Table: seb_client_configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord) .where(id, isEqualTo(id_)) @@ -102,7 +102,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+02:00", comments="Source Table: seb_client_configuration") default int insert(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -119,7 +119,7 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+02:00", comments="Source Table: seb_client_configuration") default int insertSelective(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -136,19 +136,19 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active, lastUpdateTime, lastUpdateUser) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active, lastUpdateTime, lastUpdateUser) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+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, lastUpdateTime, lastUpdateUser) .from(sebClientConfigRecord) @@ -157,7 +157,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExample(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -171,7 +171,7 @@ public interface SebClientConfigRecordMapper { .set(lastUpdateUser).equalTo(record::getLastUpdateUser); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExampleSelective(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -185,7 +185,7 @@ public interface SebClientConfigRecordMapper { .set(lastUpdateUser).equalToWhenPresent(record::getLastUpdateUser); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+02:00", comments="Source Table: seb_client_configuration") default int updateByPrimaryKey(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -202,7 +202,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.302+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.420+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 9903ed64..f1278958 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-05-12T16:13:18.290+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+02:00", comments="Source Table: threshold") public static final ThresholdRecord thresholdRecord = new ThresholdRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.290+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+02:00", comments="Source field: threshold.id") public static final SqlColumn id = thresholdRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.291+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+02:00", comments="Source field: threshold.indicator_id") public static final SqlColumn indicatorId = thresholdRecord.indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.291+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+02:00", comments="Source field: threshold.value") public static final SqlColumn value = thresholdRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.291+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+02:00", comments="Source field: threshold.color") public static final SqlColumn color = thresholdRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.291+02:00", comments="Source field: threshold.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+02:00", comments="Source field: threshold.icon") public static final SqlColumn icon = thresholdRecord.icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.290+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+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 0e720f48..e331ecff 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-05-12T16:13:18.291+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+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-05-12T16:13:18.291+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+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-05-12T16:13:18.291+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+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-05-12T16:13:18.291+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.405+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-05-12T16:13:18.291+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.291+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.291+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.291+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+02:00", comments="Source Table: threshold") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.292+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.292+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.292+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.292+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.292+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.292+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.292+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.292+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.292+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.406+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-05-12T16:13:18.292+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.410+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 efb1d932..9cb57f06 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-05-12T16:13:18.333+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+02:00", comments="Source Table: user_activity_log") public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.333+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.333+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.333+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.333+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.333+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.333+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.333+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.333+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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 417d27e0..d237ba6d 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-05-12T16:13:18.333+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.333+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.333+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.437+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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-05-12T16:13:18.334+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.438+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 e3716b7b..006361e5 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-05-12T16:13:18.320+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source Table: user") public static final UserRecord userRecord = new UserRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.320+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.id") public static final SqlColumn id = userRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.321+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.institution_id") public static final SqlColumn institutionId = userRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.321+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.uuid") public static final SqlColumn uuid = userRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.322+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.creation_date") public static final SqlColumn creationDate = userRecord.creationDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.322+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.name") public static final SqlColumn name = userRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.322+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.surname") public static final SqlColumn surname = userRecord.surname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.322+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.username") public static final SqlColumn username = userRecord.username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.322+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.427+02:00", comments="Source field: user.password") public static final SqlColumn password = userRecord.password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.322+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.427+02:00", comments="Source field: user.email") public static final SqlColumn email = userRecord.email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.322+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.427+02:00", comments="Source field: user.language") public static final SqlColumn language = userRecord.language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.322+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.427+02:00", comments="Source field: user.timezone") public static final SqlColumn timezone = userRecord.timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.322+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.427+02:00", comments="Source field: user.active") public static final SqlColumn active = userRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.320+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+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 2a0ef471..b2361931 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-05-12T16:13:18.322+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.427+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-05-12T16:13:18.322+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.427+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-05-12T16:13:18.322+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.427+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-05-12T16:13:18.322+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.323+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.323+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.323+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.323+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+02:00", comments="Source Table: user") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.323+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.323+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.323+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.323+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.324+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.324+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.324+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.324+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.324+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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-05-12T16:13:18.324+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.428+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 645c4372..ced58580 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-05-12T16:13:18.204+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.326+02:00", comments="Source Table: view") public static final ViewRecord viewRecord = new ViewRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.204+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.326+02:00", comments="Source field: view.id") public static final SqlColumn id = viewRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.205+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.326+02:00", comments="Source field: view.name") public static final SqlColumn name = viewRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.205+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.326+02:00", comments="Source field: view.columns") public static final SqlColumn columns = viewRecord.columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.205+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.326+02:00", comments="Source field: view.position") public static final SqlColumn position = viewRecord.position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.206+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.327+02:00", comments="Source field: view.template_id") public static final SqlColumn templateId = viewRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.204+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.326+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 c07fa3be..5ef83e26 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-05-12T16:13:18.206+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.327+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-05-12T16:13:18.206+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.327+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-05-12T16:13:18.206+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.327+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-05-12T16:13:18.206+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.327+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-05-12T16:13:18.206+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.327+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-05-12T16:13:18.206+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.327+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-05-12T16:13:18.206+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.327+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-05-12T16:13:18.206+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.327+02:00", comments="Source Table: view") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.206+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.327+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-05-12T16:13:18.206+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.328+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-05-12T16:13:18.207+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.328+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-05-12T16:13:18.207+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.328+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-05-12T16:13:18.207+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.328+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-05-12T16:13:18.207+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.328+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-05-12T16:13:18.207+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.328+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-05-12T16:13:18.207+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.328+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-05-12T16:13:18.207+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.328+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-05-12T16:13:18.207+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.329+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 d9f4b77a..a82f3d57 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-05-12T16:13:18.339+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+02:00", comments="Source Table: webservice_server_info") public static final WebserviceServerInfoRecord webserviceServerInfoRecord = new WebserviceServerInfoRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+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-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+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-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+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-05-12T16:13:18.341+02:00", comments="Source field: webservice_server_info.master") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+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-05-12T16:13:18.341+02:00", comments="Source field: webservice_server_info.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.444+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-05-12T16:13:18.339+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+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 d29f0bac..6b53c189 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-05-12T16:13:18.341+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.444+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-05-12T16:13:18.341+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.444+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-05-12T16:13:18.341+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.444+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-05-12T16:13:18.341+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.444+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-05-12T16:13:18.341+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.444+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.444+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.444+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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-05-12T16:13:18.342+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.445+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 b5c1e548..300d21c4 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-05-12T16:13:18.335+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+02:00", comments="Source field: additional_attributes.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.335+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+02:00", comments="Source field: additional_attributes.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.335+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+02:00", comments="Source field: additional_attributes.entity_id") private Long entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.337+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+02:00", comments="Source field: additional_attributes.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.337+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+02:00", comments="Source field: additional_attributes.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.335+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+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-05-12T16:13:18.335+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+02:00", comments="Source field: additional_attributes.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.335+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+02:00", comments="Source field: additional_attributes.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.335+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+02:00", comments="Source field: additional_attributes.entity_id") public Long getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.337+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+02:00", comments="Source field: additional_attributes.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.337+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.439+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 57365f87..ad07908a 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,34 @@ 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-05-12T16:13:18.352+02:00", comments="Source field: batch_action.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.352+02:00", comments="Source field: batch_action.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.action_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.action_type") private String actionType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.attributes") private String attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.source_ids") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.source_ids") private String sourceIds; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.successful") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.successful") private String successful; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.last_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.last_update") private Long lastUpdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.processor_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.processor_id") private String processorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.352+02:00", comments="Source Table: batch_action") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+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; @@ -43,47 +43,47 @@ public class BatchActionRecord { this.processorId = processorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.352+02:00", comments="Source field: batch_action.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.action_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.action_type") public String getActionType() { return actionType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.attributes") public String getAttributes() { return attributes; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.source_ids") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.source_ids") public String getSourceIds() { return sourceIds; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.successful") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.successful") public String getSuccessful() { return successful; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.353+02:00", comments="Source field: batch_action.last_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.last_update") public Long getLastUpdate() { return lastUpdate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.355+02:00", comments="Source field: batch_action.processor_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.453+02:00", comments="Source field: batch_action.processor_id") public String getProcessorId() { return processorId; } @@ -92,7 +92,7 @@ public class BatchActionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table batch_action * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class BatchActionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table batch_action * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class BatchActionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table batch_action * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public int 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 869e85bd..e5584423 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-05-12T16:13:18.345+02:00", comments="Source field: certificate.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+02:00", comments="Source field: certificate.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.345+02:00", comments="Source field: certificate.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+02:00", comments="Source field: certificate.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.345+02:00", comments="Source field: certificate.aliases") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+02:00", comments="Source field: certificate.aliases") private String aliases; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.345+02:00", comments="Source field: certificate.cert_store") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+02:00", comments="Source field: certificate.cert_store") private byte[] certStore; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.345+02:00", comments="Source Table: certificate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+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-05-12T16:13:18.345+02:00", comments="Source field: certificate.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+02:00", comments="Source field: certificate.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.345+02:00", comments="Source field: certificate.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+02:00", comments="Source field: certificate.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.345+02:00", comments="Source field: certificate.aliases") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+02:00", comments="Source field: certificate.aliases") public String getAliases() { return aliases; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.345+02:00", comments="Source field: certificate.cert_store") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.446+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 648ba95d..04558333 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-05-12T16:13:18.253+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.370+02:00", comments="Source field: client_connection.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.253+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.370+02:00", comments="Source field: client_connection.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.253+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.370+02:00", comments="Source field: client_connection.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.253+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.370+02:00", comments="Source field: client_connection.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.253+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.254+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.exam_user_session_id") private String examUserSessionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.259+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.client_address") private String clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.virtual_client_address") private String virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.vdi") private Integer vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.vdi_pair_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.vdi_pair_token") private String vdiPairToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.creation_time") private Long creationTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.update_time") private Long updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.remote_proctoring_room_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.remote_proctoring_room_id") private Long remoteProctoringRoomId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.remote_proctoring_room_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.remote_proctoring_room_update") private Integer remoteProctoringRoomUpdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.client_machine_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.372+02:00", comments="Source field: client_connection.client_machine_name") private String clientMachineName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.client_os_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.372+02:00", comments="Source field: client_connection.client_os_name") private String clientOsName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.client_version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.372+02:00", comments="Source field: client_connection.client_version") private String clientVersion; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.253+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.370+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-05-12T16:13:18.253+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.370+02:00", comments="Source field: client_connection.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.253+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.370+02:00", comments="Source field: client_connection.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.253+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.370+02:00", comments="Source field: client_connection.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.253+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.253+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.258+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+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-05-12T16:13:18.259+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.client_address") public String getClientAddress() { return clientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.virtual_client_address") public String getVirtualClientAddress() { return virtualClientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.vdi") public Integer getVdi() { return vdi; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.vdi_pair_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.vdi_pair_token") public String getVdiPairToken() { return vdiPairToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.creation_time") public Long getCreationTime() { return creationTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+02:00", comments="Source field: client_connection.update_time") public Long getUpdateTime() { return updateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.remote_proctoring_room_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+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-05-12T16:13:18.260+02:00", comments="Source field: client_connection.remote_proctoring_room_update") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.371+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-05-12T16:13:18.260+02:00", comments="Source field: client_connection.client_machine_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.372+02:00", comments="Source field: client_connection.client_machine_name") public String getClientMachineName() { return clientMachineName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.client_os_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.372+02:00", comments="Source field: client_connection.client_os_name") public String getClientOsName() { return clientOsName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.260+02:00", comments="Source field: client_connection.client_version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.372+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 02d8a2b3..fa0f3125 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-05-12T16:13:18.274+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.385+02:00", comments="Source field: client_event.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.274+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.client_connection_id") private Long clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.274+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.274+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.client_time") private Long clientTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.275+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.server_time") private Long serverTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.275+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.numeric_value") private BigDecimal numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.275+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.273+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.385+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-05-12T16:13:18.274+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.385+02:00", comments="Source Table: client_event") public ClientEventRecord() { super(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.274+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.385+02:00", comments="Source field: client_event.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.274+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+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-05-12T16:13:18.274+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.client_connection_id") public Long getClientConnectionId() { return clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.274+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+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-05-12T16:13:18.274+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.274+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+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-05-12T16:13:18.274+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.client_time") public Long getClientTime() { return clientTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.274+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+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-05-12T16:13:18.275+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.server_time") public Long getServerTime() { return serverTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.275+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+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-05-12T16:13:18.275+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+02:00", comments="Source field: client_event.numeric_value") public BigDecimal getNumericValue() { return numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.275+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.386+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-05-12T16:13:18.275+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.387+02:00", comments="Source field: client_event.text") public String getText() { return text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.275+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.387+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 2b8c9921..49f8dfc3 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-05-12T16:13:18.358+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.456+02:00", comments="Source field: client_indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.358+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.456+02:00", comments="Source field: client_indicator.client_connection_id") private Long clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.359+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.456+02:00", comments="Source field: client_indicator.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.359+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+02:00", comments="Source field: client_indicator.value") private Long value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.358+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.456+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-05-12T16:13:18.358+02:00", comments="Source Table: client_indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.456+02:00", comments="Source Table: client_indicator") public ClientIndicatorRecord() { super(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.358+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.456+02:00", comments="Source field: client_indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.358+02:00", comments="Source field: client_indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.456+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-05-12T16:13:18.359+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.456+02:00", comments="Source field: client_indicator.client_connection_id") public Long getClientConnectionId() { return clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.359+02:00", comments="Source field: client_indicator.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.456+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-05-12T16:13:18.359+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.456+02:00", comments="Source field: client_indicator.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.359+02:00", comments="Source field: client_indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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-05-12T16:13:18.359+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+02:00", comments="Source field: client_indicator.value") public Long getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.359+02:00", comments="Source field: client_indicator.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.457+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 654a7145..5ee262aa 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-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.attributes") private String attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.needs_confirmation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.needs_confirmation") private Integer needsConfirmation; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+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-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.attributes") public String getAttributes() { return attributes; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.282+02:00", comments="Source field: client_instruction.needs_confirmation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+02:00", comments="Source field: client_instruction.needs_confirmation") public Integer getNeedsConfirmation() { return needsConfirmation; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.283+02:00", comments="Source field: client_instruction.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.391+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 a469a06f..d86802ea 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-05-12T16:13:18.364+02:00", comments="Source field: client_notification.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source field: client_notification.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.client_connection_id") private Long clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source field: client_notification.event_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.event_type") private Integer eventType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source field: client_notification.notification_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.notification_type") private Integer notificationType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source field: client_notification.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.value") private Long value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source field: client_notification.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source Table: client_notification") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+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-05-12T16:13:18.364+02:00", comments="Source field: client_notification.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source field: client_notification.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.client_connection_id") public Long getClientConnectionId() { return clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source field: client_notification.event_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.event_type") public Integer getEventType() { return eventType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source field: client_notification.notification_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.notification_type") public Integer getNotificationType() { return notificationType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source field: client_notification.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+02:00", comments="Source field: client_notification.value") public Long getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.364+02:00", comments="Source field: client_notification.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.459+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 d9e0a2c0..cddc3d26 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-05-12T16:13:17.964+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.146+02:00", comments="Source field: configuration_attribute.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.965+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.147+02:00", comments="Source field: configuration_attribute.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.965+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.148+02:00", comments="Source field: configuration_attribute.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.966+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.148+02:00", comments="Source field: configuration_attribute.parent_id") private Long parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.966+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.148+02:00", comments="Source field: configuration_attribute.resources") private String resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.966+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.148+02:00", comments="Source field: configuration_attribute.validator") private String validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.966+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.148+02:00", comments="Source field: configuration_attribute.dependencies") private String dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.966+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.149+02:00", comments="Source field: configuration_attribute.default_value") private String defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.956+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.141+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-05-12T16:13:17.965+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.147+02:00", comments="Source field: configuration_attribute.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.965+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.147+02:00", comments="Source field: configuration_attribute.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.965+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.148+02:00", comments="Source field: configuration_attribute.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.966+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.148+02:00", comments="Source field: configuration_attribute.parent_id") public Long getParentId() { return parentId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.966+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.148+02:00", comments="Source field: configuration_attribute.resources") public String getResources() { return resources; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.966+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.148+02:00", comments="Source field: configuration_attribute.validator") public String getValidator() { return validator; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.966+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.148+02:00", comments="Source field: configuration_attribute.dependencies") public String getDependencies() { return dependencies; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:17.967+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.149+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 Thu May 12 16:13:17 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:17 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:17 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 5dc86c8e..dc021099 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,37 +3,37 @@ 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-05-12T16:13:18.229+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.342+02:00", comments="Source field: configuration_node.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.229+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.342+02:00", comments="Source field: configuration_node.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.229+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.342+02:00", comments="Source field: configuration_node.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.230+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.342+02:00", comments="Source field: configuration_node.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.230+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.342+02:00", comments="Source field: configuration_node.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.230+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.231+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.231+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.231+02:00", comments="Source field: configuration_node.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.last_update_time") private Long lastUpdateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.231+02:00", comments="Source field: configuration_node.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.last_update_user") private String lastUpdateUser; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.229+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.342+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, Long lastUpdateTime, String lastUpdateUser) { this.id = id; this.institutionId = institutionId; @@ -47,52 +47,52 @@ public class ConfigurationNodeRecord { this.lastUpdateUser = lastUpdateUser; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.229+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.342+02:00", comments="Source field: configuration_node.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.229+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.342+02:00", comments="Source field: configuration_node.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.230+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.342+02:00", comments="Source field: configuration_node.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.230+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.342+02:00", comments="Source field: configuration_node.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.230+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.231+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.231+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.231+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.231+02:00", comments="Source field: configuration_node.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.last_update_time") public Long getLastUpdateTime() { return lastUpdateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.231+02:00", comments="Source field: configuration_node.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.343+02:00", comments="Source field: configuration_node.last_update_user") public String getLastUpdateUser() { return lastUpdateUser; } @@ -101,7 +101,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 174bbb34..f133c8d2 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-05-12T16:13:18.221+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.221+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.221+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.222+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.version") private String version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.222+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.version_date") private DateTime versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.222+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.followup") private Integer followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.221+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+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-05-12T16:13:18.221+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.221+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.221+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.222+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.version") public String getVersion() { return version; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.222+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.337+02:00", comments="Source field: configuration.version_date") public DateTime getVersionDate() { return versionDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.222+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.338+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 79fecb8e..3e7f0744 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-05-12T16:13:18.197+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.318+02:00", comments="Source field: configuration_value.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.198+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.318+02:00", comments="Source field: configuration_value.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.198+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.319+02:00", comments="Source field: configuration_value.configuration_id") private Long configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.198+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.319+02:00", comments="Source field: configuration_value.configuration_attribute_id") private Long configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.198+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.319+02:00", comments="Source field: configuration_value.list_index") private Integer listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.198+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.319+02:00", comments="Source field: configuration_value.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.196+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.318+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-05-12T16:13:18.197+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.318+02:00", comments="Source field: configuration_value.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.198+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.319+02:00", comments="Source field: configuration_value.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.198+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.319+02:00", comments="Source field: configuration_value.configuration_id") public Long getConfigurationId() { return configurationId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.198+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.319+02:00", comments="Source field: configuration_value.configuration_attribute_id") public Long getConfigurationAttributeId() { return configurationAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.198+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.319+02:00", comments="Source field: configuration_value.list_index") public Integer getListIndex() { return listIndex; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.199+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.319+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 1835834e..69b19aa9 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-05-12T16:13:18.238+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.351+02:00", comments="Source field: exam_configuration_map.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.238+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.353+02:00", comments="Source field: exam_configuration_map.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.239+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.353+02:00", comments="Source field: exam_configuration_map.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.239+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.354+02:00", comments="Source field: exam_configuration_map.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.239+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.354+02:00", comments="Source field: exam_configuration_map.user_names") private String userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.239+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.354+02:00", comments="Source field: exam_configuration_map.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.238+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.351+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-05-12T16:13:18.238+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.353+02:00", comments="Source field: exam_configuration_map.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.238+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.353+02:00", comments="Source field: exam_configuration_map.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.239+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.353+02:00", comments="Source field: exam_configuration_map.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.239+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.354+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-05-12T16:13:18.239+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.354+02:00", comments="Source field: exam_configuration_map.user_names") public String getUserNames() { return userNames; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.239+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.354+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 2cec1dfc..fbe8f0df 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 @@ -1,58 +1,71 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; +import org.joda.time.DateTime; public class ExamRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.245+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.245+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.245+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.lms_setup_id") private Long lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.245+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.external_id") private String externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.246+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.246+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.246+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.246+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.quit_password") private String quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.246+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.browser_keys") private String browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.lms_seb_restriction") private Integer lmsSebRestriction; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.updating") private Integer updating; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.lastupdate") private String lastupdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.exam_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.exam_template_id") private Long examTemplateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.248+02:00", comments="Source field: exam.last_modified") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source field: exam.last_modified") private Long lastModified; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.245+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) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source field: exam.quiz_name") + private String quizName; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source field: exam.quiz_start_time") + private DateTime quizStartTime; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source field: exam.quiz_end_time") + private DateTime quizEndTime; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source field: exam.lms_available") + private Integer lmsAvailable; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+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, String quizName, DateTime quizStartTime, DateTime quizEndTime, Integer lmsAvailable) { this.id = id; this.institutionId = institutionId; this.lmsSetupId = lmsSetupId; @@ -69,93 +82,117 @@ public class ExamRecord { this.active = active; this.examTemplateId = examTemplateId; this.lastModified = lastModified; + this.quizName = quizName; + this.quizStartTime = quizStartTime; + this.quizEndTime = quizEndTime; + this.lmsAvailable = lmsAvailable; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.245+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.245+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.245+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.lms_setup_id") public Long getLmsSetupId() { return lmsSetupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.245+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.external_id") public String getExternalId() { return externalId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.246+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.359+02:00", comments="Source field: exam.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.246+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.246+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.246+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.quit_password") public String getQuitPassword() { return quitPassword; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.246+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.browser_keys") public String getBrowserKeys() { return browserKeys; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.lms_seb_restriction") public Integer getLmsSebRestriction() { return lmsSebRestriction; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.updating") public Integer getUpdating() { return updating; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.lastupdate") public String getLastupdate() { return lastupdate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.247+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.248+02:00", comments="Source field: exam.exam_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.360+02:00", comments="Source field: exam.exam_template_id") public Long getExamTemplateId() { return examTemplateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.248+02:00", comments="Source field: exam.last_modified") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source field: exam.last_modified") public Long getLastModified() { return lastModified; } + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source field: exam.quiz_name") + public String getQuizName() { + return quizName; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source field: exam.quiz_start_time") + public DateTime getQuizStartTime() { + return quizStartTime; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source field: exam.quiz_end_time") + public DateTime getQuizEndTime() { + return quizEndTime; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.361+02:00", comments="Source field: exam.lms_available") + public Integer getLmsAvailable() { + return lmsAvailable; + } + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public String toString() { @@ -179,6 +216,10 @@ public class ExamRecord { sb.append(", active=").append(active); sb.append(", examTemplateId=").append(examTemplateId); sb.append(", lastModified=").append(lastModified); + sb.append(", quizName=").append(quizName); + sb.append(", quizStartTime=").append(quizStartTime); + sb.append(", quizEndTime=").append(quizEndTime); + sb.append(", lmsAvailable=").append(lmsAvailable); sb.append("]"); return sb.toString(); } @@ -187,7 +228,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public boolean equals(Object that) { @@ -216,14 +257,18 @@ public class ExamRecord { && (this.getLastupdate() == null ? other.getLastupdate() == null : this.getLastupdate().equals(other.getLastupdate())) && (this.getActive() == null ? other.getActive() == null : this.getActive().equals(other.getActive())) && (this.getExamTemplateId() == null ? other.getExamTemplateId() == null : this.getExamTemplateId().equals(other.getExamTemplateId())) - && (this.getLastModified() == null ? other.getLastModified() == null : this.getLastModified().equals(other.getLastModified())); + && (this.getLastModified() == null ? other.getLastModified() == null : this.getLastModified().equals(other.getLastModified())) + && (this.getQuizName() == null ? other.getQuizName() == null : this.getQuizName().equals(other.getQuizName())) + && (this.getQuizStartTime() == null ? other.getQuizStartTime() == null : this.getQuizStartTime().equals(other.getQuizStartTime())) + && (this.getQuizEndTime() == null ? other.getQuizEndTime() == null : this.getQuizEndTime().equals(other.getQuizEndTime())) + && (this.getLmsAvailable() == null ? other.getLmsAvailable() == null : this.getLmsAvailable().equals(other.getLmsAvailable())); } /** * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public int hashCode() { @@ -245,6 +290,10 @@ public class ExamRecord { result = prime * result + ((getActive() == null) ? 0 : getActive().hashCode()); result = prime * result + ((getExamTemplateId() == null) ? 0 : getExamTemplateId().hashCode()); result = prime * result + ((getLastModified() == null) ? 0 : getLastModified().hashCode()); + result = prime * result + ((getQuizName() == null) ? 0 : getQuizName().hashCode()); + result = prime * result + ((getQuizStartTime() == null) ? 0 : getQuizStartTime().hashCode()); + result = prime * result + ((getQuizEndTime() == null) ? 0 : getQuizEndTime().hashCode()); + result = prime * result + ((getLmsAvailable() == null) ? 0 : getLmsAvailable().hashCode()); return result; } } \ No newline at end of file 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 595434c6..32657b39 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-05-12T16:13:18.349+02:00", comments="Source field: exam_template.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.configuration_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.configuration_template_id") private Long configurationTemplateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.exam_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.exam_type") private String examType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.450+02:00", comments="Source field: exam_template.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.indicator_templates") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.450+02:00", comments="Source field: exam_template.indicator_templates") private String indicatorTemplates; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.institutional_default") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+02:00", comments="Source field: exam_template.institutional_default") private Integer institutionalDefault; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source Table: exam_template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+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-05-12T16:13:18.349+02:00", comments="Source field: exam_template.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.configuration_template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.configuration_template_id") public Long getConfigurationTemplateId() { return configurationTemplateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.449+02:00", comments="Source field: exam_template.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.exam_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.450+02:00", comments="Source field: exam_template.exam_type") public String getExamType() { return examType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.450+02:00", comments="Source field: exam_template.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.indicator_templates") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+02:00", comments="Source field: exam_template.indicator_templates") public String getIndicatorTemplates() { return indicatorTemplates; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.349+02:00", comments="Source field: exam_template.institutional_default") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.451+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 7dec2d22..e9288a4e 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-05-12T16:13:18.286+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.icon") private String icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.tags") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.tags") private String tags; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+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-05-12T16:13:18.286+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.color") public String getColor() { return color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+02:00", comments="Source field: indicator.icon") public String getIcon() { return icon; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.286+02:00", comments="Source field: indicator.tags") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.398+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 7c6c064a..7660cd77 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-05-12T16:13:18.294+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.412+02:00", comments="Source field: institution.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.412+02:00", comments="Source field: institution.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.412+02:00", comments="Source field: institution.url_suffix") private String urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.412+02:00", comments="Source field: institution.theme_name") private String themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.413+02:00", comments="Source field: institution.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.413+02:00", comments="Source field: institution.logo_image") private String logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.412+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-05-12T16:13:18.294+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.412+02:00", comments="Source field: institution.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.412+02:00", comments="Source field: institution.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.412+02:00", comments="Source field: institution.url_suffix") public String getUrlSuffix() { return urlSuffix; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.412+02:00", comments="Source field: institution.theme_name") public String getThemeName() { return themeName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.413+02:00", comments="Source field: institution.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.294+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.413+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 ac804c57..3207112a 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-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_type") private String lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_url") private String lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_clientname") private String lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_clientsecret") private String lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_rest_api_token") private String lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_proxy_host") private String lmsProxyHost; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_proxy_port") private Integer lmsProxyPort; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") private String lmsProxyAuthUsername; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") private String lmsProxyAuthSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.update_time") private Long updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+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-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_type") public String getLmsType() { return lmsType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_url") public String getLmsUrl() { return lmsUrl; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_clientname") public String getLmsClientname() { return lmsClientname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_clientsecret") public String getLmsClientsecret() { return lmsClientsecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+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-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_proxy_host") public String getLmsProxyHost() { return lmsProxyHost; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.305+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.lms_proxy_port") public Integer getLmsProxyPort() { return lmsProxyPort; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+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-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+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-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.421+02:00", comments="Source field: lms_setup.update_time") public Long getUpdateTime() { return updateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.306+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.422+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 f6d177da..ff0bafb2 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-05-12T16:13:18.211+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.330+02:00", comments="Source field: orientation.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.211+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.330+02:00", comments="Source field: orientation.config_attribute_id") private Long configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.211+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.330+02:00", comments="Source field: orientation.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.211+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.330+02:00", comments="Source field: orientation.view_id") private Long viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.211+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.group_id") private String groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.x_position") private Integer xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.y_position") private Integer yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.width") private Integer width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.height") private Integer height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.title") private String title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.211+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.330+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-05-12T16:13:18.211+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.330+02:00", comments="Source field: orientation.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.211+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.330+02:00", comments="Source field: orientation.config_attribute_id") public Long getConfigAttributeId() { return configAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.211+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.330+02:00", comments="Source field: orientation.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.211+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.330+02:00", comments="Source field: orientation.view_id") public Long getViewId() { return viewId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.group_id") public String getGroupId() { return groupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.x_position") public Integer getxPosition() { return xPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.y_position") public Integer getyPosition() { return yPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.width") public Integer getWidth() { return width; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.331+02:00", comments="Source field: orientation.height") public Integer getHeight() { return height; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.212+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.332+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 3eb72236..fc1e17db 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-05-12T16:13:18.268+02:00", comments="Source field: remote_proctoring_room.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.378+02:00", comments="Source field: remote_proctoring_room.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.268+02:00", comments="Source field: remote_proctoring_room.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.378+02:00", comments="Source field: remote_proctoring_room.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.268+02:00", comments="Source field: remote_proctoring_room.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.378+02:00", comments="Source field: remote_proctoring_room.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.268+02:00", comments="Source field: remote_proctoring_room.size") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.378+02:00", comments="Source field: remote_proctoring_room.size") private Integer size; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.subject") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.379+02:00", comments="Source field: remote_proctoring_room.subject") private String subject; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.townhall_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.379+02:00", comments="Source field: remote_proctoring_room.townhall_room") private Integer townhallRoom; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.break_out_connections") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.379+02:00", comments="Source field: remote_proctoring_room.break_out_connections") private String breakOutConnections; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.join_key") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.379+02:00", comments="Source field: remote_proctoring_room.join_key") private String joinKey; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.room_data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.379+02:00", comments="Source field: remote_proctoring_room.room_data") private String roomData; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.268+02:00", comments="Source Table: remote_proctoring_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.378+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-05-12T16:13:18.268+02:00", comments="Source field: remote_proctoring_room.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.378+02:00", comments="Source field: remote_proctoring_room.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.268+02:00", comments="Source field: remote_proctoring_room.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.378+02:00", comments="Source field: remote_proctoring_room.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.268+02:00", comments="Source field: remote_proctoring_room.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.378+02:00", comments="Source field: remote_proctoring_room.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.size") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.378+02:00", comments="Source field: remote_proctoring_room.size") public Integer getSize() { return size; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.subject") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.379+02:00", comments="Source field: remote_proctoring_room.subject") public String getSubject() { return subject; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.townhall_room") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.379+02:00", comments="Source field: remote_proctoring_room.townhall_room") public Integer getTownhallRoom() { return townhallRoom; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.break_out_connections") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.379+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-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.join_key") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.379+02:00", comments="Source field: remote_proctoring_room.join_key") public String getJoinKey() { return joinKey; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.269+02:00", comments="Source field: remote_proctoring_room.room_data") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.379+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 924379c4..69d731c6 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-05-12T16:13:18.325+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.429+02:00", comments="Source field: user_role.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.325+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.429+02:00", comments="Source field: user_role.user_id") private Long userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.325+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.429+02:00", comments="Source field: user_role.role_name") private String roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.325+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.429+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-05-12T16:13:18.325+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.429+02:00", comments="Source field: user_role.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.325+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.429+02:00", comments="Source field: user_role.user_id") public Long getUserId() { return userId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.325+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.429+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 644bc22f..c5076050 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,37 +4,37 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class SebClientConfigRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.298+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.417+02:00", comments="Source field: seb_client_configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.299+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.417+02:00", comments="Source field: seb_client_configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.299+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.417+02:00", comments="Source field: seb_client_configuration.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.299+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.417+02:00", comments="Source field: seb_client_configuration.date") private DateTime date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.299+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.client_name") private String clientName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.client_secret") private String clientSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.last_update_time") private Long lastUpdateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.last_update_user") private String lastUpdateUser; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.298+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.415+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, Long lastUpdateTime, String lastUpdateUser) { this.id = id; this.institutionId = institutionId; @@ -48,52 +48,52 @@ public class SebClientConfigRecord { this.lastUpdateUser = lastUpdateUser; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.298+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.417+02:00", comments="Source field: seb_client_configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.299+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.417+02:00", comments="Source field: seb_client_configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.299+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.417+02:00", comments="Source field: seb_client_configuration.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.299+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.date") public DateTime getDate() { return date; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.299+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.client_name") public String getClientName() { return clientName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.client_secret") public String getClientSecret() { return clientSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.encrypt_secret") public String getEncryptSecret() { return encryptSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.last_update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.last_update_time") public Long getLastUpdateTime() { return lastUpdateTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.300+02:00", comments="Source field: seb_client_configuration.last_update_user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.418+02:00", comments="Source field: seb_client_configuration.last_update_user") public String getLastUpdateUser() { return lastUpdateUser; } @@ -102,7 +102,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public String toString() { @@ -128,7 +128,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public boolean equals(Object that) { @@ -158,7 +158,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 412ac4dc..8377cfe8 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-05-12T16:13:18.289+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+02:00", comments="Source field: threshold.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.289+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+02:00", comments="Source field: threshold.indicator_id") private Long indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.289+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+02:00", comments="Source field: threshold.value") private BigDecimal value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.289+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+02:00", comments="Source field: threshold.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.289+02:00", comments="Source field: threshold.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+02:00", comments="Source field: threshold.icon") private String icon; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.289+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+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-05-12T16:13:18.289+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+02:00", comments="Source field: threshold.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.289+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+02:00", comments="Source field: threshold.indicator_id") public Long getIndicatorId() { return indicatorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.289+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+02:00", comments="Source field: threshold.value") public BigDecimal getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.289+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+02:00", comments="Source field: threshold.color") public String getColor() { return color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.289+02:00", comments="Source field: threshold.icon") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.404+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 1319a424..b63bee99 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-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.user_uuid") private String userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.activity_type") private String activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.entity_id") private String entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.message") private String message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.435+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-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.user_uuid") public String getUserUuid() { return userUuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.activity_type") public String getActivityType() { return activityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+02:00", comments="Source field: user_activity_log.entity_id") public String getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.332+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.436+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 708a3d58..e61538dd 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-05-12T16:13:18.309+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.311+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.311+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.311+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.creation_date") private DateTime creationDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.318+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.318+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.surname") private String surname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.username") private String username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.password") private String password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.email") private String email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.language") private String language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.timezone") private String timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.309+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+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-05-12T16:13:18.311+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.311+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.311+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.311+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.creation_date") public DateTime getCreationDate() { return creationDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.318+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.318+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.surname") public String getSurname() { return surname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.username") public String getUsername() { return username; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.password") public String getPassword() { return password; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.425+02:00", comments="Source field: user.email") public String getEmail() { return email; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.language") public String getLanguage() { return language; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+02:00", comments="Source field: user.timezone") public String getTimezone() { return timezone; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.319+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.426+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 bee51089..ca793067 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-05-12T16:13:18.203+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.324+02:00", comments="Source field: view.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.203+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.324+02:00", comments="Source field: view.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.204+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.324+02:00", comments="Source field: view.columns") private Integer columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.204+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.325+02:00", comments="Source field: view.position") private Integer position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.204+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.325+02:00", comments="Source field: view.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.203+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.324+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-05-12T16:13:18.203+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.324+02:00", comments="Source field: view.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.203+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.324+02:00", comments="Source field: view.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.204+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.325+02:00", comments="Source field: view.columns") public Integer getColumns() { return columns; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.204+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.325+02:00", comments="Source field: view.position") public Integer getPosition() { return position; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.204+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.325+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 a201e7c9..72f37546 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-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.442+02:00", comments="Source field: webservice_server_info.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.442+02:00", comments="Source field: webservice_server_info.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+02:00", comments="Source field: webservice_server_info.service_address") private String serviceAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.master") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+02:00", comments="Source field: webservice_server_info.master") private Integer master; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+02:00", comments="Source field: webservice_server_info.update_time") private Long updateTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.339+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.442+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-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.442+02:00", comments="Source field: webservice_server_info.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+02:00", comments="Source field: webservice_server_info.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+02:00", comments="Source field: webservice_server_info.service_address") public String getServiceAddress() { return serviceAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.master") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+02:00", comments="Source field: webservice_server_info.master") public Integer getMaster() { return master; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-12T16:13:18.339+02:00", comments="Source field: webservice_server_info.update_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2022-05-16T11:24:18.443+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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 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 Thu May 12 16:13:18 CEST 2022 + * @mbg.generated Mon May 16 11:24:18 CEST 2022 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamDAO.java index c1c4cdba..ff42d228 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamDAO.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamDAO.java @@ -16,6 +16,7 @@ import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.GrantEntity; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus; +import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionSupportDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.session.impl.ExamSessionCacheService; @@ -23,12 +24,6 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.session.impl.ExamSessionCac /** Concrete EntityDAO interface of Exam entities */ public interface ExamDAO extends ActivatableEntityDAO, BulkActionSupportDAO { - /** Loads the specified exam with all data and additional attributes. - * - * @param examId the exam identifier to load - * @return Result refer to the loaded exam or to an error when happened */ - Result loadWithAdditionalAttributes(Long examId); - /** Get a GrantEntity for the exam of specified id (PK) * This is actually a Exam instance but with no course data loaded. * @@ -90,6 +85,11 @@ public interface ExamDAO extends ActivatableEntityDAO, BulkActionSup * @return Result refer to collection of exam identifiers or to an error if happened */ Result> getExamIdsForStatus(Long institutionId, ExamStatus status); + /** Gets all for active and none archived exams within the system, independently form institution and LMSSetup. + * + * @return Result refer to all exams for LMS update or to an error when happened */ + Result> allForLMSUpdate(); + /** This is used to get all Exams to check if they have to set into running state in the meanwhile. * Gets all exams in the upcoming status for run-check * @@ -185,4 +185,24 @@ public interface ExamDAO extends ActivatableEntityDAO, BulkActionSup * @return Result refer to the collection of entity keys of all involved exams or to an error when happened */ Result> deleteTemplateReferences(Long examTemplateId); + /** This is used by the internal update process to update the quiz data for the specified exam. + * This shall only be called if there are changes to the quiz data of the exam since this also + * refreshes the running exam cache. + * + * @param examId the exam identifier + * @param quizData The quiz data to update + * @param updateId The update identifier given by the update task + * @return Result refer to the given QuizData or to an error when happened */ + @CacheEvict( + cacheNames = ExamSessionCacheService.CACHE_NAME_RUNNING_EXAM, + key = "examId") + Result updateQuizData(Long examId, QuizData quizData, String updateId); + + /** This is used by the internal update process to mark exams for which the LMS related data is + * not currently available and the local data might be out-dated + * + * @param externalQuizId The exams external UUID or quiz id of the exam to mark + * @param updateId The update identifier given by the update task */ + void markLMSNotAvailable(final String externalQuizId, final String updateId); + } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java index 8fbbe2bc..c61dae30 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java @@ -439,7 +439,7 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { record.getInstitutionId(), record.getExamId(), (exam != null) ? exam.name : null, - (exam != null) ? exam.description : null, + (exam != null) ? exam.getDescription() : null, (exam != null) ? exam.startTime : null, (exam != null) ? exam.type : ExamType.UNDEFINED, (exam != null) ? exam.status : null, diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java index c7912042..bae2bd3f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java @@ -16,10 +16,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.function.Function; import java.util.function.Predicate; @@ -28,7 +26,6 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; -import org.mybatis.dynamic.sql.SqlBuilder; import org.mybatis.dynamic.sql.update.UpdateDSL; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Lazy; @@ -45,24 +42,17 @@ import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamType; import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; -import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; -import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; 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.AdditionalAttributeRecordDynamicSqlSupport; -import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.AdditionalAttributeRecordMapper; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ExamRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ExamRecordMapper; -import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.AdditionalAttributeRecord; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ExamRecord; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.impl.BulkAction; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.AdditionalAttributesDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.TransactionHandler; -import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPIService; -import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPITemplate; -import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.moodle.legacy.MoodleCourseAccess; @Lazy @Component @@ -72,21 +62,18 @@ public class ExamDAOImpl implements ExamDAO { private final ExamRecordMapper examRecordMapper; private final ExamRecordDAO examRecordDAO; private final ApplicationEventPublisher applicationEventPublisher; - private final AdditionalAttributeRecordMapper additionalAttributeRecordMapper; - private final LmsAPIService lmsAPIService; + private final AdditionalAttributesDAO additionalAttributesDAO; public ExamDAOImpl( final ExamRecordMapper examRecordMapper, final ExamRecordDAO examRecordDAO, final ApplicationEventPublisher applicationEventPublisher, - final AdditionalAttributeRecordMapper additionalAttributeRecordMapper, - final LmsAPIService lmsAPIService) { + final AdditionalAttributesDAO additionalAttributesDAO) { this.examRecordMapper = examRecordMapper; this.examRecordDAO = examRecordDAO; this.applicationEventPublisher = applicationEventPublisher; - this.additionalAttributeRecordMapper = additionalAttributeRecordMapper; - this.lmsAPIService = lmsAPIService; + this.additionalAttributesDAO = additionalAttributesDAO; } @Override @@ -101,34 +88,17 @@ public class ExamDAOImpl implements ExamDAO { .flatMap(this::toDomainModel); } - @Override - public Result loadWithAdditionalAttributes(final Long examId) { - return this.examRecordDAO - .recordById(examId) - .flatMap(record -> { - final QuizData quizData = this.lmsAPIService - .getLmsAPITemplate(record.getLmsSetupId()) - .flatMap(template -> template.getQuiz(record.getExternalId())) - .onError(error -> log.error( - "Failed to load quiz data for exam: {} error: {}", - examId, - error.getMessage())) - .getOr(null); - return toDomainModel(record, quizData, null, true); - }); - } - @Override public Result examGrantEntityByPK(final Long id) { return this.examRecordDAO.recordById(id) - .map(record -> toDomainModel(record, null, null).getOrThrow()); + .map(record -> toDomainModel(record).getOrThrow()); } @Override public Result examGrantEntityByClientConnection(final Long connectionId) { return this.examRecordDAO .recordByClientConnection(connectionId) - .map(record -> toDomainModel(record, null, null).getOrThrow()); + .map(record -> toDomainModel(record).getOrThrow()); } @Override @@ -191,9 +161,31 @@ public class ExamDAOImpl implements ExamDAO { public Result save(final Exam exam) { return this.examRecordDAO .save(exam) + .map(rec -> saveAdditionalAttributes(exam, rec)) .flatMap(this::toDomainModel); } + @Override + public Result updateQuizData( + final Long examId, + final QuizData quizData, + final String updateId) { + + return this.examRecordDAO + .updateFromQuizData(examId, quizData, updateId) + .map(rec -> saveAdditionalQuizAttributes(examId, quizData)); + } + + @Override + public void markLMSNotAvailable(final String externalQuizId, final String updateId) { + + log.info("Mark exam quiz data not available form LMS: {}", externalQuizId); + + this.examRecordDAO.idByExternalQuizId(externalQuizId) + .map(examId -> this.examRecordDAO.updateLmsNotAvailable(examId, updateId)) + .onError(error -> log.error("Failed to mark LMS not available: {}", externalQuizId, error)); + } + @Override public Result setSEBRestriction(final Long examId, final boolean sebRestriction) { return this.examRecordDAO @@ -205,6 +197,7 @@ public class ExamDAOImpl implements ExamDAO { public Result createNew(final Exam exam) { return this.examRecordDAO .createNew(exam) + .map(rec -> saveAdditionalAttributes(exam, rec)) .flatMap(this::toDomainModel); } @@ -220,7 +213,7 @@ public class ExamDAOImpl implements ExamDAO { final ExamRecord examRecord = new ExamRecord(null, null, null, null, null, null, null, null, null, null, null, null, null, BooleanUtils.toInteger(active), null, - Utils.getMillisecondsNow()); + Utils.getMillisecondsNow(), null, null, null, null); this.examRecordMapper.updateByExampleSelective(examRecord) .where(ExamRecordDynamicSqlSupport.id, isIn(ids)) @@ -287,6 +280,25 @@ public class ExamDAOImpl implements ExamDAO { .execute()); } + @Override + @Transactional(readOnly = true) + public Result> allForLMSUpdate() { + return Result.tryCatch(() -> this.examRecordMapper.selectByExample() + .where( + ExamRecordDynamicSqlSupport.active, + isEqualTo(BooleanUtils.toInteger(true))) + .and( + ExamRecordDynamicSqlSupport.status, + isNotEqualTo(ExamStatus.ARCHIVED.name())) + .and( + ExamRecordDynamicSqlSupport.updating, + isEqualTo(BooleanUtils.toInteger(false))) + + .build() + .execute()) + .flatMap(this::toDomainModel); + } + @Override public Result> allForRunCheck() { return this.examRecordDAO @@ -321,7 +333,7 @@ public class ExamDAOImpl implements ExamDAO { null, null, null, null, null, null, null, null, null, null, BooleanUtils.toInteger(true), updateId, - null, null, null); + null, null, null, null, null, null, null); this.examRecordMapper.updateByPrimaryKeySelective(newRecord); return examId; @@ -351,7 +363,7 @@ public class ExamDAOImpl implements ExamDAO { null, null, null, null, null, null, null, null, null, null, BooleanUtils.toInteger(false), updateId, - null, null, null); + null, null, null, null, null, null, null); this.examRecordMapper.updateByPrimaryKeySelective(newRecord); return examId; @@ -372,7 +384,7 @@ public class ExamDAOImpl implements ExamDAO { examId, null, null, null, null, null, null, null, null, null, null, BooleanUtils.toInteger(false), - null, null, null, null); + null, null, null, null, null, null, null, null); this.examRecordMapper.updateByPrimaryKeySelective(examRecord); return examRecord.getId(); @@ -496,12 +508,8 @@ public class ExamDAOImpl implements ExamDAO { .execute(); // delete all additional attributes - this.additionalAttributeRecordMapper - .deleteByExample() - .where(AdditionalAttributeRecordDynamicSqlSupport.entityType, isEqualTo(EntityType.EXAM.name())) - .and(AdditionalAttributeRecordDynamicSqlSupport.entityId, isIn(ids)) - .build() - .execute(); + ids.stream() + .forEach(id -> this.additionalAttributesDAO.deleteAll(EntityType.EXAM, id)); return ids.stream() .map(id -> new EntityKey(id, EntityType.EXAM)) @@ -594,7 +602,11 @@ public class ExamDAOImpl implements ExamDAO { rec.getLastupdate(), rec.getActive(), null, - Utils.getMillisecondsNow())); + Utils.getMillisecondsNow(), + rec.getQuizName(), + rec.getQuizStartTime(), + rec.getQuizEndTime(), + rec.getLmsAvailable())); result.add(new EntityKey(rec.getId(), EntityType.EXAM)); } catch (final Exception e) { @@ -673,199 +685,93 @@ public class ExamDAOImpl implements ExamDAO { exam.getDescription()); } - private Result toDomainModel(final ExamRecord record) { - return toDomainModel( - record.getLmsSetupId(), - Arrays.asList(record)) - .map(col -> col.iterator().next()); - } - private Result> toDomainModel(final Collection records) { - return Result.tryCatch(() -> { - - final HashMap> lmsSetupToRecordMapping = records - .stream() - .reduce(new LinkedHashMap<>(), - (map, record) -> Utils.mapCollect(map, record.getLmsSetupId(), record), - Utils::mapPutAll); - - return lmsSetupToRecordMapping - .entrySet() - .stream() - .flatMap(entry -> toDomainModel( - entry.getKey(), - entry.getValue()) - .onError(error -> log.error( - "Failed to get quizzes from LMS Setup: {}", - entry.getKey(), error)) - .getOr(Collections.emptyList()) - .stream()) + return records.stream() + .map(rec -> this.toDomainModel(rec).getOrThrow()) .collect(Collectors.toList()); }); } - private Result> toDomainModel( - final Long lmsSetupId, - final Collection records) { +// private QuizData getQuizData( +// final Map quizzes, +// final String externalId, +// final ExamRecord record) { +// +// if (quizzes.containsKey(externalId)) { +// return quizzes.get(externalId); +// } else { +// // If this is a Moodle quiz, try to recover from eventually restore of the quiz on the LMS side +// // NOTE: This is a workaround for Moodle quizzes that had have a recovery within the sandbox tool +// // Where potentially quiz identifiers get changed during such a recovery and the SEB Server +// // internal mapping is not working properly anymore. In this case we try to recover from such +// // a case by using the short name of the quiz and search for the quiz within the course with this +// // short name. If one quiz has been found that matches all criteria, we adapt the internal id +// // mapping to this quiz. +// // If recovering fails, this returns null and the calling side must handle the lack of quiz data +// try { +// final LmsSetup lmsSetup = this.lmsAPIService +// .getLmsSetup(record.getLmsSetupId()) +// .getOrThrow(); +// if (lmsSetup.lmsType == LmsType.MOODLE) { +// +// log.info("Try to recover quiz data for Moodle quiz with internal identifier: {}", externalId); +// +// // get former quiz name attribute +// final String formerName = getFormerName(record.getId()); +// if (formerName != null) { +// +// log.debug("Found formerName quiz name: {}", formerName); +// +// // get the course name identifier +// final String shortname = MoodleCourseAccess.getShortname(externalId); +// if (StringUtils.isNotBlank(shortname)) { +// +// log.debug("Using short-name: {} for recovering", shortname); +// +// final QuizData recoveredQuizData = this.lmsAPIService +// .getLmsAPITemplate(lmsSetup.id) +// .map(template -> template.getQuizzes(new FilterMap()) +// .getOrThrow() +// .stream() +// .filter(quiz -> { +// final String qShortName = MoodleCourseAccess.getShortname(quiz.id); +// return qShortName != null && qShortName.equals(shortname); +// }) +// .filter(quiz -> formerName.equals(quiz.name)) +// .findAny() +// .get()) +// .getOrThrow(); +// if (recoveredQuizData != null) { +// +// log.debug("Found quiz data for recovering: {}", recoveredQuizData); +// +// // save exam with new external id +// this.examRecordMapper.updateByPrimaryKeySelective(new ExamRecord( +// record.getId(), +// null, null, +// recoveredQuizData.id, +// null, null, null, null, null, null, null, null, null, null, null, +// Utils.getMillisecondsNow())); +// +// log.debug("Successfully recovered exam quiz data to new externalId {}", +// recoveredQuizData.id); +// } +// return recoveredQuizData; +// } +// } +// } +// } catch (final Exception e) { +// log.debug("Failed to try to recover from Moodle quiz restore: {}", e.getMessage()); +// } +// return null; +// } +// } + + private Result toDomainModel(final ExamRecord record) { return Result.tryCatch(() -> { - // map records - final Map recordMapping = records - .stream() - .collect(Collectors.toMap(ExamRecord::getExternalId, Function.identity())); - - // get and map quizzes - final Map quizzes = this.lmsAPIService - .getLmsAPITemplate(lmsSetupId) - .flatMap(template -> template.getQuizzes(recordMapping.keySet())) - .getOrElse(() -> Collections.emptyList()) - .stream() - .collect(Collectors.toMap(q -> q.id, Function.identity())); - - if (records.size() != quizzes.size()) { - - // Check if we have LMS connection to verify the source of the exam quiz mismatch - final LmsAPITemplate lmsSetup = this.lmsAPIService - .getLmsAPITemplate(lmsSetupId) - .getOrThrow(); - - if (log.isDebugEnabled()) { - log.debug("Quizzes size mismatch detected by getting exams quiz data from LMS: {}", lmsSetup); - } - - try { - lmsSetup.checkCourseAPIAccess(); - } catch (final Exception e) { - // No course access on the LMS. This means we can't get any quizzes from this LMSSetup at the moment - // All exams are marked as corrupt because of LMS Setup failure - - log.warn("Failed to get quizzes form LMS Setup. No access to LMS {}", lmsSetup.lmsSetup()); - - return recordMapping.entrySet() - .stream() - .map(entry -> toDomainModel( - entry.getValue(), - null, - ExamStatus.CORRUPT_NO_LMS_CONNECTION) - .getOr(null)) - .filter(Objects::nonNull) - .collect(Collectors.toList()); - } - } - - // collect Exam's - return recordMapping.entrySet() - .stream() - .map(entry -> toDomainModel( - entry.getValue(), - getQuizData(quizzes, entry.getKey(), entry.getValue()), - ExamStatus.CORRUPT_INVALID_ID) - .onError(error -> log.error( - "Failed to get quiz data from remote LMS for exam: ", - error)) - .getOr(null)) - .filter(Objects::nonNull) - .collect(Collectors.toList()); - }); - } - - private QuizData getQuizData( - final Map quizzes, - final String externalId, - final ExamRecord record) { - - if (quizzes.containsKey(externalId)) { - return quizzes.get(externalId); - } else { - // If this is a Moodle quiz, try to recover from eventually restore of the quiz on the LMS side - // NOTE: This is a workaround for Moodle quizzes that had have a recovery within the sandbox tool - // Where potentially quiz identifiers get changed during such a recovery and the SEB Server - // internal mapping is not working properly anymore. In this case we try to recover from such - // a case by using the short name of the quiz and search for the quiz within the course with this - // short name. If one quiz has been found that matches all criteria, we adapt the internal id - // mapping to this quiz. - // If recovering fails, this returns null and the calling side must handle the lack of quiz data - try { - final LmsSetup lmsSetup = this.lmsAPIService - .getLmsSetup(record.getLmsSetupId()) - .getOrThrow(); - if (lmsSetup.lmsType == LmsType.MOODLE) { - - log.info("Try to recover quiz data for Moodle quiz with internal identifier: {}", externalId); - - // get former quiz name attribute - final String formerName = getFormerName(record.getId()); - if (formerName != null) { - - log.debug("Found formerName quiz name: {}", formerName); - - // get the course name identifier - final String shortname = MoodleCourseAccess.getShortname(externalId); - if (StringUtils.isNotBlank(shortname)) { - - log.debug("Using short-name: {} for recovering", shortname); - - final QuizData recoveredQuizData = this.lmsAPIService - .getLmsAPITemplate(lmsSetup.id) - .map(template -> template.getQuizzes(new FilterMap()) - .getOrThrow() - .stream() - .filter(quiz -> { - final String qShortName = MoodleCourseAccess.getShortname(quiz.id); - return qShortName != null && qShortName.equals(shortname); - }) - .filter(quiz -> formerName.equals(quiz.name)) - .findAny() - .get()) - .getOrThrow(); - if (recoveredQuizData != null) { - - log.debug("Found quiz data for recovering: {}", recoveredQuizData); - - // save exam with new external id - this.examRecordMapper.updateByPrimaryKeySelective(new ExamRecord( - record.getId(), - null, null, - recoveredQuizData.id, - null, null, null, null, null, null, null, null, null, null, null, - Utils.getMillisecondsNow())); - - log.debug("Successfully recovered exam quiz data to new externalId {}", - recoveredQuizData.id); - } - return recoveredQuizData; - } - } - } - } catch (final Exception e) { - log.debug("Failed to try to recover from Moodle quiz restore: {}", e.getMessage()); - } - return null; - } - } - - private Result toDomainModel( - final ExamRecord record, - final QuizData quizData, - final ExamStatus statusOverride) { - - return this.toDomainModel(record, quizData, statusOverride, false); - } - - private Result toDomainModel( - final ExamRecord record, - final QuizData quizData, - final ExamStatus statusOverride, - final boolean withAdditionalAttributed) { - - return Result.tryCatch(() -> { - - if (quizData != null) { - saveFormerName(record.getId(), quizData.name); - } - final Collection supporter = (StringUtils.isNotBlank(record.getSupporter())) ? Arrays.asList(StringUtils.split(record.getSupporter(), Constants.LIST_SEPARATOR_CHAR)) : null; @@ -878,39 +784,28 @@ public class ExamDAOImpl implements ExamDAO { status = ExamStatus.UP_COMING; } - Map additionalAttributes = null; - if (withAdditionalAttributed) { - additionalAttributes = this.additionalAttributeRecordMapper.selectByExample() - .where( - AdditionalAttributeRecordDynamicSqlSupport.entityType, - SqlBuilder.isEqualTo(EntityType.EXAM.name())) - .and( - AdditionalAttributeRecordDynamicSqlSupport.entityId, - SqlBuilder.isEqualTo(record.getId())) - .build() - .execute() - .stream() - .collect(Collectors.toMap(r -> r.getName(), r -> r.getValue())); - } + final Map additionalAttributes = this.additionalAttributesDAO + .getAdditionalAttributes(EntityType.EXAM, record.getId()) + .getOrThrow() + .stream() + .collect(Collectors.toMap(rec -> rec.getName(), rec -> rec.getValue())); return new Exam( record.getId(), record.getInstitutionId(), record.getLmsSetupId(), record.getExternalId(), - (quizData != null), - (quizData != null) ? quizData.name : getFormerName(record.getId()), - (quizData != null) ? quizData.description : null, - (quizData != null) ? quizData.startTime : null, - (quizData != null) ? quizData.endTime : null, - (quizData != null) ? quizData.startURL : Constants.EMPTY_NOTE, + BooleanUtils.toBooleanObject(record.getLmsAvailable()), + record.getQuizName(), + record.getQuizStartTime(), + record.getQuizEndTime(), ExamType.valueOf(record.getType()), record.getOwner(), supporter, - (quizData != null) ? status : (statusOverride != null) ? statusOverride : status, + status, BooleanUtils.toBooleanObject(record.getLmsSebRestriction()), record.getBrowserKeys(), - BooleanUtils.toBooleanObject((quizData != null) ? record.getActive() : null), + BooleanUtils.toBooleanObject(record.getActive()), record.getLastupdate(), record.getExamTemplateId(), record.getLastModified(), @@ -918,59 +813,30 @@ public class ExamDAOImpl implements ExamDAO { }); } - private void saveFormerName(final Long id, final String name) { - try { - final Integer updated = this.additionalAttributeRecordMapper - .updateByExampleSelective(new AdditionalAttributeRecord(null, null, null, null, name)) - .where( - AdditionalAttributeRecordDynamicSqlSupport.entityType, - SqlBuilder.isEqualTo(EntityType.EXAM.name())) - .and( - AdditionalAttributeRecordDynamicSqlSupport.entityId, - SqlBuilder.isEqualTo(id)) - .and( - AdditionalAttributeRecordDynamicSqlSupport.name, - SqlBuilder.isEqualTo("formerQuizName")) - .build() - .execute(); - - if (updated == null || updated.intValue() < 1) { - this.additionalAttributeRecordMapper.insert(new AdditionalAttributeRecord( - null, - EntityType.EXAM.name(), - id, - "formerQuizName", - name)); - } - } catch (final Exception e) { - log.error("Failed to save former name: examId: {}, name: {} error: {}", id, name, e.getMessage()); + private ExamRecord saveAdditionalAttributes(final Exam exam, final ExamRecord rec) { + if (exam.additionalAttributesIncluded()) { + this.additionalAttributesDAO.saveAdditionalAttributes( + EntityType.EXAM, + rec.getId(), + exam.additionalAttributes) + .getOrThrow(); } + + return rec; } - private String getFormerName(final Long id) { - try { - return this.additionalAttributeRecordMapper - .selectByExample() - .where( - AdditionalAttributeRecordDynamicSqlSupport.entityType, - SqlBuilder.isEqualTo(EntityType.EXAM.name())) - .and( - AdditionalAttributeRecordDynamicSqlSupport.entityId, - SqlBuilder.isEqualTo(id)) - .and( - AdditionalAttributeRecordDynamicSqlSupport.name, - SqlBuilder.isEqualTo("formerQuizName")) - .build() - .execute() - .stream() - .collect(Utils.toSingleton()) - .getValue(); - } catch (final Exception e) { - if (log.isDebugEnabled()) { - log.warn("Failed to get former name: examId: {} error: {}", id, e.getMessage()); - } - return null; - } + private QuizData saveAdditionalQuizAttributes(final Long examId, final QuizData quizData) { + final Map additionalAttributes = new HashMap<>(quizData.getAdditionalAttributes()); + additionalAttributes.put(QuizData.QUIZ_ATTR_DESCRIPTION, quizData.description); + additionalAttributes.put(QuizData.QUIZ_ATTR_START_URL, quizData.startURL); + + this.additionalAttributesDAO.saveAdditionalAttributes( + EntityType.EXAM, + examId, + additionalAttributes) + .getOrThrow(); + + return quizData; } } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamRecordDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamRecordDAO.java index e02aa7eb..3aa02dd7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamRecordDAO.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamRecordDAO.java @@ -28,9 +28,11 @@ import org.springframework.transaction.annotation.Transactional; import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.Domain.EXAM; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamType; +import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Utils; @@ -74,6 +76,20 @@ public class ExamRecordDAO { }); } + @Transactional(readOnly = true) + public Result idByExternalQuizId(final String externalQuizId) { + return Result.tryCatch(() -> { + return this.examRecordMapper.selectIdsByExample() + .where( + ExamRecordDynamicSqlSupport.externalId, + isEqualToWhenPresent(externalQuizId)) + .build() + .execute() + .stream() + .collect(Utils.toSingleton()); + }); + } + @Transactional(readOnly = true) public Result recordByClientConnection(final Long connectionId) { return Result.tryCatch(() -> this.clientConnectionRecordMapper @@ -162,6 +178,9 @@ public class ExamRecordDAO { .and( ExamRecordDynamicSqlSupport.status, isEqualToWhenPresent(filterMap.getExamStatus())) + .and( + ExamRecordDynamicSqlSupport.quizName, + isLikeWhenPresent(filterMap.getSQLWildcard(EXAM.ATTR_QUIZ_NAME))) .build() .execute(); @@ -184,7 +203,7 @@ public class ExamRecordDAO { null, null, null, null, null, null, null, null, status.name(), null, null, null, null, null, - Utils.getMillisecondsNow()); + Utils.getMillisecondsNow(), null, null, null, null); this.examRecordMapper.updateByPrimaryKeySelective(newExamRecord); return this.examRecordMapper.selectByPrimaryKey(examId); @@ -221,7 +240,8 @@ public class ExamRecordDAO { null, // lastUpdate null, // active exam.examTemplateId, - Utils.getMillisecondsNow()); + Utils.getMillisecondsNow(), + null, null, null, null); this.examRecordMapper.updateByPrimaryKeySelective(examRecord); return this.examRecordMapper.selectByPrimaryKey(exam.id); @@ -229,6 +249,90 @@ public class ExamRecordDAO { .onError(TransactionHandler::rollback); } + @Transactional + public Result updateFromQuizData( + final Long examId, + final QuizData quizData, + final String updateId) { + + return Result.tryCatch(() -> { + + // check internal persistent write-lock + final ExamRecord oldRecord = this.examRecordMapper.selectByPrimaryKey(examId); + if (BooleanUtils.isTrue(BooleanUtils.toBooleanObject(oldRecord.getUpdating()))) { + throw new IllegalStateException("Exam is currently locked: " + examId); + } + + final ExamRecord examRecord = new ExamRecord( + examId, + null, null, + quizData.id, + null, null, null, null, null, null, null, null, + updateId, + null, null, + Utils.getMillisecondsNow(), + quizData.getName(), + quizData.getStartTime(), + quizData.getEndTime(), + BooleanUtils.toIntegerObject(true)); + + this.examRecordMapper.updateByPrimaryKeySelective(examRecord); + return this.examRecordMapper.selectByPrimaryKey(examId); + }) + .onError(TransactionHandler::rollback); + } + + @Transactional + public Result updateLmsNotAvailable(final Long examId, final String updateId) { + return Result.tryCatch(() -> { + + // check internal persistent write-lock + final ExamRecord oldRecord = this.examRecordMapper.selectByPrimaryKey(examId); + if (BooleanUtils.isTrue(BooleanUtils.toBooleanObject(oldRecord.getUpdating()))) { + throw new IllegalStateException("Exam is currently locked: " + examId); + } + + final ExamRecord examRecord = new ExamRecord( + examId, + null, null, null, null, null, null, null, null, null, + null, null, + updateId, + null, null, + Utils.getMillisecondsNow(), + null, null, null, + BooleanUtils.toIntegerObject(false)); + + this.examRecordMapper.updateByPrimaryKeySelective(examRecord); + return this.examRecordMapper.selectByPrimaryKey(examId); + }) + .onError(TransactionHandler::rollback); + } + + @Transactional + public Result archive(final Long examId) { + return Result.tryCatch(() -> { + + // check internal persistent write-lock + final ExamRecord oldRecord = this.examRecordMapper.selectByPrimaryKey(examId); + if (BooleanUtils.isTrue(BooleanUtils.toBooleanObject(oldRecord.getUpdating()))) { + throw new IllegalStateException("Exam is currently locked: " + examId); + } + + final ExamRecord examRecord = new ExamRecord( + examId, + null, null, null, null, null, null, null, null, + ExamStatus.ARCHIVED.name(), + null, null, null, null, null, + Utils.getMillisecondsNow(), + null, null, null, + BooleanUtils.toIntegerObject(false)); + + this.examRecordMapper.updateByPrimaryKeySelective(examRecord); + return this.examRecordMapper.selectByPrimaryKey(examId); + }) + .onError(TransactionHandler::rollback); + } + @Transactional public Result setSEBRestriction(final Long examId, final boolean sebRestriction) { return Result.tryCatch(() -> { @@ -238,7 +342,8 @@ public class ExamRecordDAO { null, null, null, null, null, null, null, null, null, BooleanUtils.toInteger(sebRestriction), null, null, null, null, - Utils.getMillisecondsNow()); + Utils.getMillisecondsNow(), + null, null, null, null); this.examRecordMapper.updateByPrimaryKeySelective(examRecord); return this.examRecordMapper.selectByPrimaryKey(examId); @@ -285,7 +390,11 @@ public class ExamRecordDAO { null, // lastUpdate BooleanUtils.toInteger(true), exam.examTemplateId, - Utils.getMillisecondsNow()); + Utils.getMillisecondsNow(), + exam.name, + exam.startTime, + exam.endTime, + BooleanUtils.toIntegerObject(true)); this.examRecordMapper.insert(examRecord); return examRecord; diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/SEBRestrictionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/SEBRestrictionServiceImpl.java index 8b9b6c7f..40fdd722 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/SEBRestrictionServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/SEBRestrictionServiceImpl.java @@ -156,7 +156,7 @@ public class SEBRestrictionServiceImpl implements SEBRestrictionService { final Collection browserExamKeys = sebRestriction.getBrowserExamKeys(); final Exam newExam = new Exam( exam.id, - null, null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null, null, exam.supporter, exam.status, null, diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionCacheService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionCacheService.java index c73714a9..f414d798 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionCacheService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionCacheService.java @@ -10,7 +10,6 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl; import java.io.ByteArrayOutputStream; -import org.apache.commons.lang3.BooleanUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.annotation.CacheEvict; @@ -76,7 +75,7 @@ public class ExamSessionCacheService { log.debug("Verify running exam for id: {}", examId); } - final Result byPK = this.examDAO.loadWithAdditionalAttributes(examId); + final Result byPK = this.examDAO.byPK(examId); if (byPK.hasError()) { log.error("Failed to find/load Exam with id {}", examId, byPK.getError()); return null; @@ -115,7 +114,7 @@ public class ExamSessionCacheService { } public boolean isRunning(final Exam exam) { - if (exam == null || !exam.active || BooleanUtils.isFalse(exam.lmsDataAvailable)) { + if (exam == null || !exam.active) { return false; } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionControlTask.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionControlTask.java index 456ddf47..4ccbc16e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionControlTask.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionControlTask.java @@ -8,7 +8,10 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl; +import java.util.Collections; +import java.util.HashMap; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import org.joda.time.DateTime; @@ -103,6 +106,7 @@ public class ExamSessionControlTask implements DisposableBean { log.debug("Run exam update task with Id: {}", updateId); } + controlExamLMSUpdate(); controlExamStart(updateId); controlExamEnd(updateId); this.examDAO.releaseAgedLocks(); @@ -145,6 +149,46 @@ public class ExamSessionControlTask implements DisposableBean { this.sebClientConnectionService.cleanupInstructions(); } + private void controlExamLMSUpdate() { + if (log.isTraceEnabled()) { + log.trace("Start update exams form LMS"); + } + + try { + + // create mapping + final Map> examToLMSMapping = new HashMap<>(); + this.examDAO.allForLMSUpdate() + .onError(error -> log.error("Failed to update exams from LMS: ", error)) + .getOr(Collections.emptyList()) + .stream() + .forEach(exam -> { + final Map examMap = (examToLMSMapping.computeIfAbsent( + exam.lmsSetupId, + lmsId -> new HashMap<>())); + examMap.put(exam.externalId, exam); + }); + + // update per LMS Setup + examToLMSMapping.entrySet().stream().forEach(updateEntry -> { + final Result> updateExamFromLMS = this.examUpdateHandler + .updateExamFromLMS(updateEntry.getKey(), updateEntry.getValue()); + + if (updateExamFromLMS.hasError()) { + log.error("Failed to update exams from LMS: ", updateExamFromLMS.getError()); + } else { + final Set failedExams = updateExamFromLMS.get(); + if (!failedExams.isEmpty()) { + log.warn("Failed to update following exams from LMS: {}", failedExams); + } + } + }); + + } catch (final Exception e) { + log.error("Unexpected error while update exams from LMS: ", e); + } + } + private void controlExamStart(final String updateId) { if (log.isTraceEnabled()) { log.trace("Check starting exams: {}", updateId); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java index b657a0cc..88950bb8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java @@ -132,12 +132,9 @@ public class ExamSessionServiceImpl implements ExamSessionService { .getOrThrow(); // check lms connection - if (exam.status == ExamStatus.CORRUPT_NO_LMS_CONNECTION) { + if (!exam.lmsAvailable) { result.add(ErrorMessage.EXAM_CONSISTENCY_VALIDATION_LMS_CONNECTION.of(exam.getModelId())); } - if (exam.status == ExamStatus.CORRUPT_INVALID_ID) { - result.add(ErrorMessage.EXAM_CONSISTENCY_VALIDATION_INVALID_ID_REFERENCE.of(exam.getModelId())); - } if (exam.status == ExamStatus.RUNNING) { // check exam supporter diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamUpdateHandler.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamUpdateHandler.java index c77244dc..6c6324a9 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamUpdateHandler.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamUpdateHandler.java @@ -8,6 +8,12 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl; +import java.util.HashSet; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + +import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.slf4j.Logger; @@ -19,12 +25,18 @@ import org.springframework.stereotype.Service; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus; +import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; +import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.webservice.WebserviceInfo; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap; +import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPIService; +import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPITemplate; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.SEBRestrictionService; +import ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl.moodle.legacy.MoodleCourseAccess; import ch.ethz.seb.sebserver.webservice.servicelayer.session.ExamFinishedEvent; import ch.ethz.seb.sebserver.webservice.servicelayer.session.ExamStartedEvent; @@ -38,6 +50,7 @@ class ExamUpdateHandler { private final ExamDAO examDAO; private final ApplicationEventPublisher applicationEventPublisher; private final SEBRestrictionService sebRestrictionService; + private final LmsAPIService lmsAPIService; private final String updatePrefix; private final Long examTimeSuffix; @@ -45,12 +58,14 @@ class ExamUpdateHandler { final ExamDAO examDAO, final ApplicationEventPublisher applicationEventPublisher, final SEBRestrictionService sebRestrictionService, + final LmsAPIService lmsAPIService, final WebserviceInfo webserviceInfo, @Value("${sebserver.webservice.api.exam.time-suffix:3600000}") final Long examTimeSuffix) { this.examDAO = examDAO; this.applicationEventPublisher = applicationEventPublisher; this.sebRestrictionService = sebRestrictionService; + this.lmsAPIService = lmsAPIService; this.updatePrefix = webserviceInfo.getLocalHostAddress() + "_" + webserviceInfo.getServerPort() + "_"; this.examTimeSuffix = examTimeSuffix; @@ -64,6 +79,51 @@ class ExamUpdateHandler { return this.updatePrefix + Utils.getMillisecondsNow(); } + Result> updateExamFromLMS(final Long lmsSetupId, final Map exams) { + + return Result.tryCatch(() -> { + final Set failedOrMissing = new HashSet<>(exams.keySet()); + final String updateId = this.createUpdateId(); + + this.lmsAPIService.getLmsAPITemplate(lmsSetupId) + .flatMap(template -> template.getQuizzes(new HashSet<>(exams.keySet()))) + .getOrThrow() + .stream() + .forEach(quiz -> { + + try { + final Exam exam = exams.get(quiz.id); + if (hasChanges(exam, quiz)) { + + final Result updateQuizData = this.examDAO + .updateQuizData(exam.id, quiz, updateId); + + if (updateQuizData.hasError()) { + log.error("Failed to update quiz data for exam: {}", quiz, + updateQuizData.getError()); + } else { + failedOrMissing.remove(quiz.id); + log.info("Updated quiz data for exam: {}", updateQuizData.get()); + } + + } else { + failedOrMissing.remove(quiz.id); + } + } catch (final Exception e) { + log.error("Unexpected error while trying to update quiz data for exam: {}", quiz, e); + } + }); + + if (!failedOrMissing.isEmpty()) { + new HashSet<>(failedOrMissing).stream() + .forEach(quizId -> tryRecoverQuizData(quizId, lmsSetupId, exams, updateId) + .onSuccess(quizData -> failedOrMissing.remove(quizId))); + } + + return failedOrMissing; + }); + } + Result updateRunning(final Long examId) { return this.examDAO.byPK(examId) .map(exam -> { @@ -126,4 +186,93 @@ class ExamUpdateHandler { }); } + private boolean hasChanges(final Exam exam, final QuizData quizData) { + if (!Objects.equals(exam.name, quizData.name) || + !Objects.equals(exam.startTime, quizData.startTime) || + !Objects.equals(exam.endTime, quizData.endTime) || + !Objects.equals(exam.getDescription(), quizData.description) || + !Objects.equals(exam.getStartURL(), quizData.startURL)) { + + return true; + } + + if (quizData.additionalAttributes != null && !quizData.additionalAttributes.isEmpty()) { + for (final Map.Entry attr : quizData.additionalAttributes.entrySet()) { + if (!Objects.equals(exam.getAdditionalAttribute(attr.getKey()), attr.getValue())) { + return true; + } + } + } + + return false; + } + + private Result tryRecoverQuizData( + final String quizId, + final Long lmsSetupId, + final Map exams, + final String updateId) { + + return Result.tryCatch(() -> { + final LmsAPITemplate lmsTemplate = this.lmsAPIService + .getLmsAPITemplate(lmsSetupId) + .getOrThrow(); + + // If this is a Moodle quiz, try to recover from eventually restore of the quiz on the LMS side + // NOTE: This is a workaround for Moodle quizzes that had have a recovery within the sandbox tool + // Where potentially quiz identifiers get changed during such a recovery and the SEB Server + // internal mapping is not working properly anymore. In this case we try to recover from such + // a case by using the short name of the quiz and search for the quiz within the course with this + // short name. If one quiz has been found that matches all criteria, we adapt the internal id + // mapping to this quiz. + // If recovering fails, this returns null and the calling side must handle the lack of quiz data + if (lmsTemplate.getType() == LmsType.MOODLE) { + + log.info("Try to recover quiz data for Moodle quiz with internal identifier: {}", quizId); + + final Exam exam = exams.get(quizId); + if (exam != null && exam.name != null) { + + log.debug("Found formerName quiz name: {}", exam.name); + + // get the course name identifier + final String shortname = MoodleCourseAccess.getShortname(quizId); + if (StringUtils.isNotBlank(shortname)) { + + log.debug("Using short-name: {} for recovering", shortname); + + final QuizData recoveredQuizData = lmsTemplate + .getQuizzes(new FilterMap()) + .getOrThrow() + .stream() + .filter(quiz -> { + final String qShortName = MoodleCourseAccess.getShortname(quiz.id); + return qShortName != null && qShortName.equals(shortname); + }) + .filter(quiz -> exam.name.equals(quiz.name)) + .findAny() + .get(); + + if (recoveredQuizData != null) { + + log.debug("Found quiz data for recovering: {}", recoveredQuizData); + + // save exam with new external id and quit data + this.examDAO + .updateQuizData(exam.id, recoveredQuizData, updateId) + .getOrThrow(); + + log.debug("Successfully recovered exam quiz data to new externalId {}", + recoveredQuizData.id); + } + return recoveredQuizData; + } + } + } + + this.examDAO.markLMSNotAvailable(quizId, updateId); + throw new RuntimeException("Not Available"); + }); + } + } 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 0d4f6a9a..b89cb934 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 @@ -26,3 +26,13 @@ ADD COLUMN IF NOT EXISTS `last_update_time` BIGINT UNSIGNED NULL AFTER `active`, ADD COLUMN IF NOT EXISTS `last_update_user` VARCHAR(255) NULL AFTER `last_update_time` ; +-- ----------------------------------------------------- +-- Alter Table `exam` +-- ----------------------------------------------------- + +ALTER TABLE `exam` +ADD COLUMN IF NOT EXISTS `quiz_name` VARCHAR(255) NULL AFTER `last_modified`, +ADD COLUMN IF NOT EXISTS `quiz_start_time` DATETIME NULL AFTER `quiz_name`, +ADD COLUMN IF NOT EXISTS `quiz_end_time` DATETIME NULL AFTER `quiz_start_time`, +ADD COLUMN IF NOT EXISTS `lms_available` INT(1) NULL AFTER `quiz_end_time`, +; \ No newline at end of file diff --git a/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java b/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java index 4b9f8f94..2652e7ac 100644 --- a/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java +++ b/src/test/java/ch/ethz/seb/sebserver/gbl/model/ModelObjectJSONGenerator.java @@ -195,8 +195,8 @@ public class ModelObjectJSONGenerator { System.out.println(writerWithDefaultPrettyPrinter.writeValueAsString(domainObject)); domainObject = new Exam( - 1L, 1L, 1L, "externalId", true, "name", "description", DateTime.now(), DateTime.now(), - "startURL", ExamType.BYOD, "owner", + 1L, 1L, 1L, "externalId", true, "name", DateTime.now(), DateTime.now(), + ExamType.BYOD, "owner", Arrays.asList("user1", "user2"), ExamStatus.RUNNING, false, "browserExamKeys", true, null, null, null, null); System.out.println(domainObject.getClass().getSimpleName() + ":"); 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 5caf7ce7..c5252d82 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 @@ -886,10 +886,8 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest { newExam.externalId, true, newExam.name, - newExam.description, newExam.startTime, newExam.endTime, - newExam.startURL, ExamType.MANAGED, null, Utils.immutableCollectionOf(userId), diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/ExamAPITest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/ExamAPITest.java index 733dad65..3076b492 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/ExamAPITest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/ExamAPITest.java @@ -56,10 +56,8 @@ public class ExamAPITest extends AdministrationAPIIntegrationTester { exam.lmsSetupId, exam.externalId, true, exam.name, - exam.description, exam.startTime, exam.endTime, - exam.startURL, exam.type, exam.owner, Arrays.asList("user5"), @@ -87,10 +85,8 @@ public class ExamAPITest extends AdministrationAPIIntegrationTester { exam.lmsSetupId, exam.externalId, true, exam.name, - exam.description, exam.startTime, exam.endTime, - exam.startURL, exam.type, exam.owner, Arrays.asList("user2"), diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporterTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporterTest.java index 5fd809ba..37f25e1a 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporterTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/SEBClientEventCSVExporterTest.java @@ -109,9 +109,9 @@ public class SEBClientEventCSVExporterTest { public void streamDataTestWithExam() { final SEBClientEventCSVExporter exporter = new SEBClientEventCSVExporter(); final ClientEventRecord event = new ClientEventRecord(0L, 1L, 2, 3L, 4L, new BigDecimal(5), "text"); - final Exam exam = new Exam(0L, 1L, 3L, "externalid", true, "name", "description", new DateTime(1L), + final Exam exam = new Exam(0L, 1L, 3L, "externalid", true, "name", new DateTime(1L), new DateTime(1L), - "startURL", Exam.ExamType.BYOD, "owner", new ArrayList<>(), Exam.ExamStatus.RUNNING, false, "bek", true, + Exam.ExamType.BYOD, "owner", new ArrayList<>(), Exam.ExamStatus.RUNNING, false, "bek", true, "lastUpdate", 4L, null, null); final ByteArrayOutputStream stream = new ByteArrayOutputStream(); final BufferedOutputStream output = new BufferedOutputStream(stream); @@ -133,9 +133,9 @@ public class SEBClientEventCSVExporterTest { "seb_os_name", "seb_machine_name", "seb_version"); final SEBClientEventCSVExporter exporter = new SEBClientEventCSVExporter(); final ClientEventRecord event = new ClientEventRecord(0L, 1L, 2, 3L, 4L, new BigDecimal(5), "text"); - final Exam exam = new Exam(0L, 1L, 3L, "externalid", true, "name", "description", new DateTime(1L), + final Exam exam = new Exam(0L, 1L, 3L, "externalid", true, "name", new DateTime(1L), new DateTime(1L), - "startURL", Exam.ExamType.BYOD, "owner", new ArrayList<>(), Exam.ExamStatus.RUNNING, false, "bek", true, + Exam.ExamType.BYOD, "owner", new ArrayList<>(), Exam.ExamStatus.RUNNING, false, "bek", true, "lastUpdate", 4L, null, null); final ByteArrayOutputStream stream = new ByteArrayOutputStream(); final BufferedOutputStream output = new BufferedOutputStream(stream); diff --git a/src/test/resources/schema-test.sql b/src/test/resources/schema-test.sql index 6d505024..dfc6b80f 100644 --- a/src/test/resources/schema-test.sql +++ b/src/test/resources/schema-test.sql @@ -70,6 +70,10 @@ CREATE TABLE IF NOT EXISTS `exam` ( `active` INT(1) NOT NULL, `exam_template_id` BIGINT UNSIGNED NULL, `last_modified` BIGINT NULL, + `quiz_name` VARCHAR(255) NULL, + `quiz_start_time` DATETIME NULL, + `quiz_end_time` DATETIME NULL, + `lms_available` INT(1) NULL, PRIMARY KEY (`id`), INDEX `lms_setup_key_idx` (`lms_setup_id` ASC), INDEX `institution_key_idx` (`institution_id` ASC),