From 65cdb1dc52eac21e2e1f76bf38d22d4fd044d129 Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 11 Aug 2020 14:23:24 +0200 Subject: [PATCH] SEBSERV-139 SEB instruction for proctoring support --- .../ch/ethz/seb/sebserver/gbl/api/API.java | 2 + .../seb/sebserver/gbl/api/EntityType.java | 2 +- .../ethz/seb/sebserver/gbl/model/Domain.java | 4 +- .../gbl/model/session/ClientInstruction.java | 13 +- .../sebserver/gui/GuiWebsecurityConfig.java | 3 +- .../seb/sebserver/gui/RAPSpringConfig.java | 35 +++++- .../content/MonitoringClientConnection.java | 7 ++ ...ionalAttributeRecordDynamicSqlSupport.java | 14 +-- .../AdditionalAttributeRecordMapper.java | 36 +++--- ...ientConnectionRecordDynamicSqlSupport.java | 22 ++-- .../mapper/ClientConnectionRecordMapper.java | 36 +++--- .../ClientEventRecordDynamicSqlSupport.java | 18 +-- .../batis/mapper/ClientEventRecordMapper.java | 36 +++--- ...entInstructionRecordDynamicSqlSupport.java | 24 ++-- .../mapper/ClientInstructionRecordMapper.java | 66 ++++++---- ...ationAttributeRecordDynamicSqlSupport.java | 20 ++-- .../ConfigurationAttributeRecordMapper.java | 36 +++--- ...figurationNodeRecordDynamicSqlSupport.java | 20 ++-- .../mapper/ConfigurationNodeRecordMapper.java | 36 +++--- .../ConfigurationRecordDynamicSqlSupport.java | 16 +-- .../mapper/ConfigurationRecordMapper.java | 36 +++--- ...igurationValueRecordDynamicSqlSupport.java | 16 +-- .../ConfigurationValueRecordMapper.java | 36 +++--- ...nfigurationMapRecordDynamicSqlSupport.java | 16 +-- .../ExamConfigurationMapRecordMapper.java | 36 +++--- .../mapper/ExamRecordDynamicSqlSupport.java | 32 ++--- .../batis/mapper/ExamRecordMapper.java | 36 +++--- .../IndicatorRecordDynamicSqlSupport.java | 14 +-- .../batis/mapper/IndicatorRecordMapper.java | 36 +++--- .../InstitutionRecordDynamicSqlSupport.java | 16 +-- .../batis/mapper/InstitutionRecordMapper.java | 36 +++--- .../LmsSetupRecordDynamicSqlSupport.java | 30 ++--- .../batis/mapper/LmsSetupRecordMapper.java | 36 +++--- .../OrientationRecordDynamicSqlSupport.java | 24 ++-- .../batis/mapper/OrientationRecordMapper.java | 36 +++--- .../mapper/RoleRecordDynamicSqlSupport.java | 10 +- .../batis/mapper/RoleRecordMapper.java | 36 +++--- ...ebClientConfigRecordDynamicSqlSupport.java | 20 ++-- .../mapper/SebClientConfigRecordMapper.java | 36 +++--- .../ThresholdRecordDynamicSqlSupport.java | 12 +- .../batis/mapper/ThresholdRecordMapper.java | 36 +++--- ...serActivityLogRecordDynamicSqlSupport.java | 18 +-- .../mapper/UserActivityLogRecordMapper.java | 36 +++--- .../mapper/UserRecordDynamicSqlSupport.java | 28 ++--- .../batis/mapper/UserRecordMapper.java | 36 +++--- .../mapper/ViewRecordDynamicSqlSupport.java | 14 +-- .../batis/mapper/ViewRecordMapper.java | 36 +++--- ...viceServerInfoRecordDynamicSqlSupport.java | 10 +- .../WebserviceServerInfoRecordMapper.java | 36 +++--- .../model/AdditionalAttributeRecord.java | 28 ++--- .../batis/model/ClientConnectionRecord.java | 44 +++---- .../batis/model/ClientEventRecord.java | 52 ++++---- .../batis/model/ClientInstructionRecord.java | 56 ++++++--- .../model/ConfigurationAttributeRecord.java | 40 +++---- .../batis/model/ConfigurationNodeRecord.java | 40 +++---- .../batis/model/ConfigurationRecord.java | 32 ++--- .../batis/model/ConfigurationValueRecord.java | 32 ++--- .../model/ExamConfigurationMapRecord.java | 32 ++--- .../datalayer/batis/model/ExamRecord.java | 64 +++++----- .../batis/model/IndicatorRecord.java | 28 ++--- .../batis/model/InstitutionRecord.java | 32 ++--- .../datalayer/batis/model/LmsSetupRecord.java | 60 +++++----- .../batis/model/OrientationRecord.java | 48 ++++---- .../datalayer/batis/model/RoleRecord.java | 20 ++-- .../batis/model/SebClientConfigRecord.java | 40 +++---- .../batis/model/ThresholdRecord.java | 24 ++-- .../batis/model/UserActivityLogRecord.java | 36 +++--- .../datalayer/batis/model/UserRecord.java | 56 ++++----- .../datalayer/batis/model/ViewRecord.java | 28 ++--- .../model/WebserviceServerInfoRecord.java | 20 ++-- .../servicelayer/dao/ClientConnectionDAO.java | 3 + .../dao/ClientInstructionDAO.java | 3 +- .../dao/impl/ClientConnectionDAOImpl.java | 35 ++++++ .../dao/impl/ClientInstructionDAOImpl.java | 44 ++++++- .../session/SEBClientConnectionService.java | 6 + .../session/SEBInstructionService.java | 50 ++++++-- .../impl/SEBClientConnectionServiceImpl.java | 76 +++++++++++- .../impl/SEBInstructionServiceImpl.java | 113 ++++++++++++------ .../weblayer/api/ExamAPI_V1_Controller.java | 5 + .../V3_1__add_instruction_column_v1_1.sql | 3 + src/test/resources/schema-test.sql | 2 + 81 files changed, 1372 insertions(+), 1026 deletions(-) create mode 100644 src/main/resources/config/sql/base/V3_1__add_instruction_column_v1_1.sql diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java b/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java index 94ac5708..63881173 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java @@ -97,6 +97,8 @@ public final class API { public static final String EXAM_API_PING_NUMBER = "ping-number"; + public static final String EXAM_API_PING_INSTRUCTION_CONFIRM = "instruction-confirm"; + public static final String EXAM_API_EVENT_ENDPOINT = "/seblog"; // ************************* 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 dfa1754c..c867c410 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="2020-07-29T14:49:53.339+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2020-08-11T12:03:38.626+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 d25fcfe1..63a93c4a 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="2020-07-29T14:49:53.286+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2020-08-11T12:03:38.566+02:00") public interface Domain { interface CONFIGURATION_ATTRIBUTE { @@ -145,6 +145,8 @@ public interface Domain { String ATTR_CONNECTION_TOKEN = "connectionToken"; String ATTR_TYPE = "type"; String ATTR_ATTRIBUTES = "attributes"; + String ATTR_NEEDS_CONFIRMATION = "needsConfirmation"; + String ATTR_TIMESTAMP = "timestamp"; } interface INDICATOR { diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientInstruction.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientInstruction.java index 0d826a41..23b8808e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientInstruction.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientInstruction.java @@ -24,7 +24,18 @@ import ch.ethz.seb.sebserver.gbl.util.Utils; public final class ClientInstruction { public enum InstructionType { - SEB_QUIT + SEB_QUIT, + SEB_PROCTORING + } + + public interface SEB_INSTRUCTION_ATTRIBUTES { + public interface SEB_PROCTORING { + public static final String SERVICE_TYPE = "service-type"; + public static final String METHOD = "method"; + public static final String JITSI_URL = "jitsiMeetServerURL"; + public static final String JITSI_ROOM = "jitsiMeetRoom"; + public static final String JITSI_TOKEN = "jitsiMeetToken"; + } } @JsonProperty(Domain.CLIENT_INSTRUCTION.ATTR_ID) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/GuiWebsecurityConfig.java b/src/main/java/ch/ethz/seb/sebserver/gui/GuiWebsecurityConfig.java index 321414f7..c3b75dd0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/GuiWebsecurityConfig.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/GuiWebsecurityConfig.java @@ -50,7 +50,8 @@ public class GuiWebsecurityConfig extends WebSecurityConfigurerAdapter { web .ignoring() .requestMatchers(PUBLIC_URLS) - .antMatchers(this.guiEntryPoint); + .antMatchers(this.guiEntryPoint) + .antMatchers("/proctoring/*"); } @Override diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/RAPSpringConfig.java b/src/main/java/ch/ethz/seb/sebserver/gui/RAPSpringConfig.java index 3b24c2d3..6501568d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/RAPSpringConfig.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/RAPSpringConfig.java @@ -8,7 +8,15 @@ package ch.ethz.seb.sebserver.gui; -import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import java.io.IOException; + +import javax.servlet.ServletContext; +import javax.servlet.ServletContextListener; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.eclipse.rap.rwt.engine.RWTServlet; import org.eclipse.rap.rwt.engine.RWTServletContextListener; import org.slf4j.Logger; @@ -22,8 +30,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.ReloadableResourceBundleMessageSource; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextListener; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; @Configuration @GuiProfile @@ -55,6 +62,28 @@ public class RAPSpringConfig { return new ServletRegistrationBean<>(new RWTServlet(), this.entrypoint + "/*"); } + @Bean + public ServletRegistrationBean servletProctoringRegistrationBean() { + return new ServletRegistrationBean<>(new ProctoringServlet(), "/proctoring/*"); + } + + private static class ProctoringServlet extends HttpServlet { + + private static final long serialVersionUID = 3475978419653411800L; + + @Override + protected void doGet( + final HttpServletRequest req, + final HttpServletResponse resp) + throws ServletException, IOException { + + System.out.println("********************************"); + resp.getOutputStream().println("Hello"); + + } + + } + @Bean public MessageSource messageSource() { final ReloadableResourceBundleMessageSource reloadableResourceBundleMessageSource = diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java index a41455af..393a6268 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java @@ -300,6 +300,13 @@ public class MonitoringClientConnection implements TemplateComposer { + "'proctoring'," + "'height=400,width=800,location=no,scrollbars=yes,status=no,menubar=yes,toolbar=yes,titlebar=yes');"); +// final JavaScriptExecutor javaScriptExecutor = RWT.getClient().getService(JavaScriptExecutor.class); +// javaScriptExecutor.execute( +// "window.open(" +// + "'http://localhost:8080/proctoring'," +// + "'proctoring'," +// + "'height=400,width=800,location=no,scrollbars=yes,status=no,menubar=yes,toolbar=yes,titlebar=yes');"); + return action; } 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 4150ed00..aaf01e7b 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="2020-07-29T14:49:53.487+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+02:00", comments="Source Table: additional_attributes") public static final AdditionalAttributeRecord additionalAttributeRecord = new AdditionalAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+02:00", comments="Source field: additional_attributes.id") public static final SqlColumn id = additionalAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.488+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+02:00", comments="Source field: additional_attributes.entity_type") public static final SqlColumn entityType = additionalAttributeRecord.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.488+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+02:00", comments="Source field: additional_attributes.entity_id") public static final SqlColumn entityId = additionalAttributeRecord.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.488+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+02:00", comments="Source field: additional_attributes.name") public static final SqlColumn name = additionalAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.488+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+02:00", comments="Source field: additional_attributes.value") public static final SqlColumn value = additionalAttributeRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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 9e0de362..9accee52 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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+02:00", comments="Source Table: additional_attributes") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.754+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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="2020-07-29T14:49:53.488+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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/ClientConnectionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java index 57ad3328..15dde911 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,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientConnectionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+02:00", comments="Source Table: client_connection") public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+02:00", comments="Source field: client_connection.id") public static final SqlColumn id = clientConnectionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.445+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+02:00", comments="Source field: client_connection.institution_id") public static final SqlColumn institutionId = clientConnectionRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.445+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+02:00", comments="Source field: client_connection.exam_id") public static final SqlColumn examId = clientConnectionRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.445+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+02:00", comments="Source field: client_connection.status") public static final SqlColumn status = clientConnectionRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.445+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+02:00", comments="Source field: client_connection.connection_token") public static final SqlColumn connectionToken = clientConnectionRecord.connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.445+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+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="2020-07-29T14:49:53.445+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+02:00", comments="Source field: client_connection.client_address") public static final SqlColumn clientAddress = clientConnectionRecord.clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.445+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+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="2020-07-29T14:49:53.445+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+02:00", comments="Source field: client_connection.creation_time") public static final SqlColumn creationTime = clientConnectionRecord.creationTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+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 6b14f9ec..03b64d6b 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="2020-07-29T14:49:53.445+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+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="2020-07-29T14:49:53.445+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+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="2020-07-29T14:49:53.445+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+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="2020-07-29T14:49:53.445+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+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), @@ -60,7 +60,7 @@ public interface ClientConnectionRecordMapper { }) ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.713+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), @@ -75,22 +75,22 @@ public interface ClientConnectionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+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="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+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="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+02:00", comments="Source Table: client_connection") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+02:00", comments="Source Table: client_connection") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+02:00", comments="Source Table: client_connection") default int insert(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -114,7 +114,7 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+02:00", comments="Source Table: client_connection") default int insertSelective(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -130,19 +130,19 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+02:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+02:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+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, creationTime) .from(clientConnectionRecord) @@ -151,7 +151,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+02:00", comments="Source Table: client_connection") default UpdateDSL> updateByExample(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -164,7 +164,7 @@ public interface ClientConnectionRecordMapper { .set(creationTime).equalTo(record::getCreationTime); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+02:00", comments="Source Table: client_connection") default UpdateDSL> updateByExampleSelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -177,7 +177,7 @@ public interface ClientConnectionRecordMapper { .set(creationTime).equalToWhenPresent(record::getCreationTime); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+02:00", comments="Source Table: client_connection") default int updateByPrimaryKey(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -193,7 +193,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.446+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.714+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 53906a44..70cebbbd 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="2020-07-29T14:49:53.451+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.717+02:00", comments="Source Table: client_event") public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.451+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.717+02:00", comments="Source field: client_event.id") public static final SqlColumn id = clientEventRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.451+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.717+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="2020-07-29T14:49:53.452+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+02:00", comments="Source field: client_event.type") public static final SqlColumn type = clientEventRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.452+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+02:00", comments="Source field: client_event.client_time") public static final SqlColumn clientTime = clientEventRecord.clientTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.453+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+02:00", comments="Source field: client_event.server_time") public static final SqlColumn serverTime = clientEventRecord.serverTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.453+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+02:00", comments="Source field: client_event.numeric_value") public static final SqlColumn numericValue = clientEventRecord.numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.453+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+02:00", comments="Source field: client_event.text") public static final SqlColumn text = clientEventRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.451+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.717+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 b002b773..53eae3f6 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="2020-07-29T14:49:53.453+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+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="2020-07-29T14:49:53.453+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+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="2020-07-29T14:49:53.453+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+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="2020-07-29T14:49:53.453+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+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="2020-07-29T14:49:53.453+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+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="2020-07-29T14:49:53.453+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+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="2020-07-29T14:49:53.453+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+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="2020-07-29T14:49:53.453+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.718+02:00", comments="Source Table: client_event") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.454+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.719+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="2020-07-29T14:49:53.454+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.719+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="2020-07-29T14:49:53.454+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.719+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="2020-07-29T14:49:53.454+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.719+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="2020-07-29T14:49:53.454+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.719+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="2020-07-29T14:49:53.454+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.719+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="2020-07-29T14:49:53.454+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.719+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="2020-07-29T14:49:53.454+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.719+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="2020-07-29T14:49:53.454+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.719+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="2020-07-29T14:49:53.454+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.719+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/ClientInstructionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java index e0c96d3e..d120dd30 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,25 +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="2020-07-29T14:49:53.457+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source Table: client_instruction") public static final ClientInstructionRecord clientInstructionRecord = new ClientInstructionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.457+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.id") public static final SqlColumn id = clientInstructionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.457+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.exam_id") public static final SqlColumn examId = clientInstructionRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.457+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.connection_token") public static final SqlColumn connectionToken = clientInstructionRecord.connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.457+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+02:00", comments="Source field: client_instruction.type") public static final SqlColumn type = clientInstructionRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.457+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+02:00", comments="Source field: client_instruction.attributes") public static final SqlColumn attributes = clientInstructionRecord.attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.457+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+02:00", comments="Source field: client_instruction.needs_confirmation") + public static final SqlColumn needsConfirmation = clientInstructionRecord.needsConfirmation; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+02:00", comments="Source field: client_instruction.timestamp") + public static final SqlColumn timestamp = clientInstructionRecord.timestamp; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source Table: client_instruction") public static final class ClientInstructionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); @@ -36,6 +42,10 @@ public final class ClientInstructionRecordDynamicSqlSupport { public final SqlColumn attributes = column("attributes", JDBCType.VARCHAR); + public final SqlColumn needsConfirmation = column("needs_confirmation", JDBCType.INTEGER); + + public final SqlColumn timestamp = column("timestamp", JDBCType.BIGINT); + public ClientInstructionRecord() { super("client_instruction"); } 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 98e5a97f..4e7d6be4 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,57 +32,61 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientInstructionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.457+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+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="2020-07-29T14:49:53.457+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+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="2020-07-29T14:49:53.457+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+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="2020-07-29T14:49:53.457+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+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), @Arg(column="exam_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), @Arg(column="connection_token", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="type", javaType=String.class, jdbcType=JdbcType.VARCHAR), - @Arg(column="attributes", javaType=String.class, jdbcType=JdbcType.VARCHAR) + @Arg(column="attributes", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="needs_confirmation", javaType=Integer.class, jdbcType=JdbcType.INTEGER), + @Arg(column="timestamp", javaType=Long.class, jdbcType=JdbcType.BIGINT) }) ClientInstructionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.457+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+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), @Arg(column="exam_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), @Arg(column="connection_token", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="type", javaType=String.class, jdbcType=JdbcType.VARCHAR), - @Arg(column="attributes", javaType=String.class, jdbcType=JdbcType.VARCHAR) + @Arg(column="attributes", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="needs_confirmation", javaType=Integer.class, jdbcType=JdbcType.INTEGER), + @Arg(column="timestamp", javaType=Long.class, jdbcType=JdbcType.BIGINT) }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+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="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+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="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+02:00", comments="Source Table: client_instruction") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+02:00", comments="Source Table: client_instruction") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord) .where(id, isEqualTo(id_)) @@ -90,7 +94,7 @@ public interface ClientInstructionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.722+02:00", comments="Source Table: client_instruction") default int insert(ClientInstructionRecord record) { return insert(SqlBuilder.insert(record) .into(clientInstructionRecord) @@ -98,11 +102,13 @@ public interface ClientInstructionRecordMapper { .map(connectionToken).toProperty("connectionToken") .map(type).toProperty("type") .map(attributes).toProperty("attributes") + .map(needsConfirmation).toProperty("needsConfirmation") + .map(timestamp).toProperty("timestamp") .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.723+02:00", comments="Source Table: client_instruction") default int insertSelective(ClientInstructionRecord record) { return insert(SqlBuilder.insert(record) .into(clientInstructionRecord) @@ -110,68 +116,78 @@ public interface ClientInstructionRecordMapper { .map(connectionToken).toPropertyWhenPresent("connectionToken", record::getConnectionToken) .map(type).toPropertyWhenPresent("type", record::getType) .map(attributes).toPropertyWhenPresent("attributes", record::getAttributes) + .map(needsConfirmation).toPropertyWhenPresent("needsConfirmation", record::getNeedsConfirmation) + .map(timestamp).toPropertyWhenPresent("timestamp", record::getTimestamp) .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.723+02:00", comments="Source Table: client_instruction") default QueryExpressionDSL>> selectByExample() { - return SelectDSL.selectWithMapper(this::selectMany, id, examId, connectionToken, type, attributes) + return SelectDSL.selectWithMapper(this::selectMany, id, examId, connectionToken, type, attributes, needsConfirmation, timestamp) .from(clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.723+02:00", comments="Source Table: client_instruction") default QueryExpressionDSL>> selectDistinctByExample() { - return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, connectionToken, type, attributes) + return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, connectionToken, type, attributes, needsConfirmation, timestamp) .from(clientInstructionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.723+02:00", comments="Source Table: client_instruction") default ClientInstructionRecord selectByPrimaryKey(Long id_) { - return SelectDSL.selectWithMapper(this::selectOne, id, examId, connectionToken, type, attributes) + return SelectDSL.selectWithMapper(this::selectOne, id, examId, connectionToken, type, attributes, needsConfirmation, timestamp) .from(clientInstructionRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.723+02:00", comments="Source Table: client_instruction") default UpdateDSL> updateByExample(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalTo(record::getExamId) .set(connectionToken).equalTo(record::getConnectionToken) .set(type).equalTo(record::getType) - .set(attributes).equalTo(record::getAttributes); + .set(attributes).equalTo(record::getAttributes) + .set(needsConfirmation).equalTo(record::getNeedsConfirmation) + .set(timestamp).equalTo(record::getTimestamp); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.723+02:00", comments="Source Table: client_instruction") default UpdateDSL> updateByExampleSelective(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalToWhenPresent(record::getExamId) .set(connectionToken).equalToWhenPresent(record::getConnectionToken) .set(type).equalToWhenPresent(record::getType) - .set(attributes).equalToWhenPresent(record::getAttributes); + .set(attributes).equalToWhenPresent(record::getAttributes) + .set(needsConfirmation).equalToWhenPresent(record::getNeedsConfirmation) + .set(timestamp).equalToWhenPresent(record::getTimestamp); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.723+02:00", comments="Source Table: client_instruction") default int updateByPrimaryKey(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalTo(record::getExamId) .set(connectionToken).equalTo(record::getConnectionToken) .set(type).equalTo(record::getType) .set(attributes).equalTo(record::getAttributes) + .set(needsConfirmation).equalTo(record::getNeedsConfirmation) + .set(timestamp).equalTo(record::getTimestamp) .where(id, isEqualTo(record::getId)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.458+02:00", comments="Source Table: client_instruction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.723+02:00", comments="Source Table: client_instruction") default int updateByPrimaryKeySelective(ClientInstructionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) .set(examId).equalToWhenPresent(record::getExamId) .set(connectionToken).equalToWhenPresent(record::getConnectionToken) .set(type).equalToWhenPresent(record::getType) .set(attributes).equalToWhenPresent(record::getAttributes) + .set(needsConfirmation).equalToWhenPresent(record::getNeedsConfirmation) + .set(timestamp).equalToWhenPresent(record::getTimestamp) .where(id, isEqualTo(record::getId)) .build() .execute(); 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 f6d7a9fb..9b469a48 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="2020-07-29T14:49:53.247+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.510+02:00", comments="Source Table: configuration_attribute") public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.250+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.514+02:00", comments="Source field: configuration_attribute.id") public static final SqlColumn id = configurationAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.251+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.515+02:00", comments="Source field: configuration_attribute.name") public static final SqlColumn name = configurationAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.251+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.515+02:00", comments="Source field: configuration_attribute.type") public static final SqlColumn type = configurationAttributeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.252+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.516+02:00", comments="Source field: configuration_attribute.parent_id") public static final SqlColumn parentId = configurationAttributeRecord.parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.252+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.516+02:00", comments="Source field: configuration_attribute.resources") public static final SqlColumn resources = configurationAttributeRecord.resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.252+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.516+02:00", comments="Source field: configuration_attribute.validator") public static final SqlColumn validator = configurationAttributeRecord.validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.252+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.521+02:00", comments="Source field: configuration_attribute.dependencies") public static final SqlColumn dependencies = configurationAttributeRecord.dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.252+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.522+02:00", comments="Source field: configuration_attribute.default_value") public static final SqlColumn defaultValue = configurationAttributeRecord.defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.249+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.513+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 936663ec..07b35598 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="2020-07-29T14:49:53.253+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.523+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="2020-07-29T14:49:53.255+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.527+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="2020-07-29T14:49:53.256+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.527+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="2020-07-29T14:49:53.257+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.530+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="2020-07-29T14:49:53.258+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.532+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="2020-07-29T14:49:53.259+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.533+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="2020-07-29T14:49:53.260+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.534+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="2020-07-29T14:49:53.261+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.535+02:00", comments="Source Table: configuration_attribute") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.262+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.536+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="2020-07-29T14:49:53.262+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.537+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="2020-07-29T14:49:53.263+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.544+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="2020-07-29T14:49:53.264+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.545+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="2020-07-29T14:49:53.265+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.547+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="2020-07-29T14:49:53.267+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.548+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="2020-07-29T14:49:53.268+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.549+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="2020-07-29T14:49:53.269+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.550+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="2020-07-29T14:49:53.271+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.551+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="2020-07-29T14:49:53.272+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.552+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 e9bbc8dd..883a338a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java @@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationNodeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.697+02:00", comments="Source Table: configuration_node") public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.697+02:00", comments="Source field: configuration_node.id") public static final SqlColumn id = configurationNodeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.428+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.697+02:00", comments="Source field: configuration_node.institution_id") public static final SqlColumn institutionId = configurationNodeRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.428+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.698+02:00", comments="Source field: configuration_node.template_id") public static final SqlColumn templateId = configurationNodeRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.428+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.698+02:00", comments="Source field: configuration_node.owner") public static final SqlColumn owner = configurationNodeRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.428+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.698+02:00", comments="Source field: configuration_node.name") public static final SqlColumn name = configurationNodeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.428+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.698+02:00", comments="Source field: configuration_node.description") public static final SqlColumn description = configurationNodeRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.428+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.698+02:00", comments="Source field: configuration_node.type") public static final SqlColumn type = configurationNodeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.428+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.698+02:00", comments="Source field: configuration_node.status") public static final SqlColumn status = configurationNodeRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.697+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 0152a421..d5dacafd 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="2020-07-29T14:49:53.428+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.698+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="2020-07-29T14:49:53.428+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.698+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="2020-07-29T14:49:53.428+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.698+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="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.698+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationNodeRecordMapper { }) ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ConfigurationNodeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+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="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+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="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") default int insert(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -111,7 +111,7 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") default int insertSelective(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -126,19 +126,19 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord) @@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExample(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -159,7 +159,7 @@ public interface ConfigurationNodeRecordMapper { .set(status).equalTo(record::getStatus); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExampleSelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -171,7 +171,7 @@ public interface ConfigurationNodeRecordMapper { .set(status).equalToWhenPresent(record::getStatus); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.429+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+02:00", comments="Source Table: configuration_node") default int updateByPrimaryKey(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -186,7 +186,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.430+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.699+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 caf0ce6f..99177e6c 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="2020-07-29T14:49:53.424+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+02:00", comments="Source Table: configuration") public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.424+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.691+02:00", comments="Source field: configuration.id") public static final SqlColumn id = configurationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.424+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.691+02:00", comments="Source field: configuration.institution_id") public static final SqlColumn institutionId = configurationRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.424+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.691+02:00", comments="Source field: configuration.configuration_node_id") public static final SqlColumn configurationNodeId = configurationRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.424+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.692+02:00", comments="Source field: configuration.version") public static final SqlColumn version = configurationRecord.version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.424+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.692+02:00", comments="Source field: configuration.version_date") public static final SqlColumn versionDate = configurationRecord.versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.425+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.692+02:00", comments="Source field: configuration.followup") public static final SqlColumn followup = configurationRecord.followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.424+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.691+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 033c759c..0c3c34f6 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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.692+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.692+02:00", comments="Source Table: configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+02:00", comments="Source Table: configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+02:00", comments="Source Table: configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.425+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.693+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="2020-07-29T14:49:53.426+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.694+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="2020-07-29T14:49:53.426+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.694+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="2020-07-29T14:49:53.426+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.694+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 5e88de4b..2117ca65 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="2020-07-29T14:49:53.405+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source Table: configuration_value") public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.405+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+02:00", comments="Source field: configuration_value.id") public static final SqlColumn id = configurationValueRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.405+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+02:00", comments="Source field: configuration_value.institution_id") public static final SqlColumn institutionId = configurationValueRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.406+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+02:00", comments="Source field: configuration_value.configuration_id") public static final SqlColumn configurationId = configurationValueRecord.configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.406+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+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="2020-07-29T14:49:53.406+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+02:00", comments="Source field: configuration_value.list_index") public static final SqlColumn listIndex = configurationValueRecord.listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.406+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+02:00", comments="Source field: configuration_value.value") public static final SqlColumn value = configurationValueRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.405+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+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 9f2697b1..3ab3384f 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="2020-07-29T14:49:53.406+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+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="2020-07-29T14:49:53.406+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+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="2020-07-29T14:49:53.406+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+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="2020-07-29T14:49:53.406+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+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="2020-07-29T14:49:53.406+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+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="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+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="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+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="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.679+02:00", comments="Source Table: configuration_value") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.680+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="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.680+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="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.680+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="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.680+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="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.680+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="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.680+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="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.680+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="2020-07-29T14:49:53.407+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.680+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="2020-07-29T14:49:53.408+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.680+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="2020-07-29T14:49:53.408+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+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 98bf3c81..1982860e 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="2020-07-29T14:49:53.432+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source Table: exam_configuration_map") public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.702+02:00", comments="Source field: exam_configuration_map.id") public static final SqlColumn id = examConfigurationMapRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.433+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.702+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="2020-07-29T14:49:53.434+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.702+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="2020-07-29T14:49:53.434+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.702+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="2020-07-29T14:49:53.434+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.702+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="2020-07-29T14:49:53.434+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.702+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="2020-07-29T14:49:53.432+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+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 3127cc46..8ef24e08 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="2020-07-29T14:49:53.434+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.702+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="2020-07-29T14:49:53.434+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.702+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="2020-07-29T14:49:53.434+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.702+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="2020-07-29T14:49:53.434+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.434+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.703+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.704+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="2020-07-29T14:49:53.435+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.704+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 df74569b..39992f03 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java @@ -6,52 +6,52 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.439+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source Table: exam") public static final ExamRecord examRecord = new ExamRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.439+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source field: exam.id") public static final SqlColumn id = examRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.439+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source field: exam.institution_id") public static final SqlColumn institutionId = examRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.439+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source field: exam.lms_setup_id") public static final SqlColumn lmsSetupId = examRecord.lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.439+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source field: exam.external_id") public static final SqlColumn externalId = examRecord.externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.439+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.707+02:00", comments="Source field: exam.owner") public static final SqlColumn owner = examRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.439+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.707+02:00", comments="Source field: exam.supporter") public static final SqlColumn supporter = examRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.439+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.707+02:00", comments="Source field: exam.type") public static final SqlColumn type = examRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.707+02:00", comments="Source field: exam.quit_password") public static final SqlColumn quitPassword = examRecord.quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.707+02:00", comments="Source field: exam.browser_keys") public static final SqlColumn browserKeys = examRecord.browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.707+02:00", comments="Source field: exam.status") public static final SqlColumn status = examRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.707+02:00", comments="Source field: exam.lms_seb_restriction") public static final SqlColumn lmsSebRestriction = examRecord.lmsSebRestriction; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.708+02:00", comments="Source field: exam.updating") public static final SqlColumn updating = examRecord.updating; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.708+02:00", comments="Source field: exam.lastupdate") public static final SqlColumn lastupdate = examRecord.lastupdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+02:00", comments="Source field: exam.active") public static final SqlColumn active = examRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.439+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source Table: exam") public static final class ExamRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java index c0b2f0de..67447aa6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+02:00", comments="Source Table: exam") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+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="2020-07-29T14:49:53.440+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,7 +65,7 @@ public interface ExamRecordMapper { }) ExamRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.440+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+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,22 +85,22 @@ public interface ExamRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.441+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+02:00", comments="Source Table: exam") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.441+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+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="2020-07-29T14:49:53.441+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+02:00", comments="Source Table: exam") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.441+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+02:00", comments="Source Table: exam") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord) .where(id, isEqualTo(id_)) @@ -108,7 +108,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.441+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+02:00", comments="Source Table: exam") default int insert(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -129,7 +129,7 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.441+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+02:00", comments="Source Table: exam") default int insertSelective(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -150,19 +150,19 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.441+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.709+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) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.441+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.710+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) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.441+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.710+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) .from(examRecord) @@ -171,7 +171,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.441+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.710+02:00", comments="Source Table: exam") default UpdateDSL> updateByExample(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -189,7 +189,7 @@ public interface ExamRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.442+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.710+02:00", comments="Source Table: exam") default UpdateDSL> updateByExampleSelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -207,7 +207,7 @@ public interface ExamRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.442+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.710+02:00", comments="Source Table: exam") default int updateByPrimaryKey(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -228,7 +228,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.442+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.710+02:00", comments="Source Table: exam") default int updateByPrimaryKeySelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java index cc583028..808af84f 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,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class IndicatorRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.461+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source Table: indicator") public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.461+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+02:00", comments="Source field: indicator.id") public static final SqlColumn id = indicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.461+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+02:00", comments="Source field: indicator.exam_id") public static final SqlColumn examId = indicatorRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.462+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+02:00", comments="Source field: indicator.type") public static final SqlColumn type = indicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.462+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+02:00", comments="Source field: indicator.name") public static final SqlColumn name = indicatorRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.462+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+02:00", comments="Source field: indicator.color") public static final SqlColumn color = indicatorRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.461+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+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 fbcbdecd..5e780acc 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="2020-07-29T14:49:53.462+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.462+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+02:00", comments="Source Table: indicator") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+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="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface IndicatorRecordMapper { }) IndicatorRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface IndicatorRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+02:00", comments="Source Table: indicator") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.727+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="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+02:00", comments="Source Table: indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+02:00", comments="Source Table: indicator") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+02:00", comments="Source Table: indicator") default int insert(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -102,7 +102,7 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+02:00", comments="Source Table: indicator") default int insertSelective(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -114,19 +114,19 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+02:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, type, name, color) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+02:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, type, name, color) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+02:00", comments="Source Table: indicator") default IndicatorRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, type, name, color) .from(indicatorRecord) @@ -135,7 +135,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.463+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+02:00", comments="Source Table: indicator") default UpdateDSL> updateByExample(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -144,7 +144,7 @@ public interface IndicatorRecordMapper { .set(color).equalTo(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+02:00", comments="Source Table: indicator") default UpdateDSL> updateByExampleSelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -153,7 +153,7 @@ public interface IndicatorRecordMapper { .set(color).equalToWhenPresent(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+02:00", comments="Source Table: indicator") default int updateByPrimaryKey(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -165,7 +165,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.728+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 39696587..69508ee0 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="2020-07-29T14:49:53.468+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source Table: institution") public static final InstitutionRecord institutionRecord = new InstitutionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.468+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.id") public static final SqlColumn id = institutionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.468+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+02:00", comments="Source field: institution.name") public static final SqlColumn name = institutionRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.468+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+02:00", comments="Source field: institution.url_suffix") public static final SqlColumn urlSuffix = institutionRecord.urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.468+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+02:00", comments="Source field: institution.theme_name") public static final SqlColumn themeName = institutionRecord.themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.468+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+02:00", comments="Source field: institution.active") public static final SqlColumn active = institutionRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.468+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+02:00", comments="Source field: institution.logo_image") public static final SqlColumn logoImage = institutionRecord.logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.468+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+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 c1a1abb3..c68eae1c 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="2020-07-29T14:49:53.468+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.468+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+02:00", comments="Source Table: institution") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.468+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+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="2020-07-29T14:49:53.468+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+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="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+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="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+02:00", comments="Source Table: institution") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+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="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+02:00", comments="Source Table: institution") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.733+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="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+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="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+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="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+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="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+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="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+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="2020-07-29T14:49:53.469+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+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="2020-07-29T14:49:53.470+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+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="2020-07-29T14:49:53.470+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+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="2020-07-29T14:49:53.470+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+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 cf22a723..388c4558 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,49 +6,49 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class LmsSetupRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source Table: lms_setup") public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.476+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.id") public static final SqlColumn id = lmsSetupRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.476+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.institution_id") public static final SqlColumn institutionId = lmsSetupRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.476+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.name") public static final SqlColumn name = lmsSetupRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.476+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.lms_type") public static final SqlColumn lmsType = lmsSetupRecord.lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.476+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.lms_url") public static final SqlColumn lmsUrl = lmsSetupRecord.lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.476+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.lms_clientname") public static final SqlColumn lmsClientname = lmsSetupRecord.lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.476+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.lms_clientsecret") public static final SqlColumn lmsClientsecret = lmsSetupRecord.lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.476+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.740+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="2020-07-29T14:49:53.476+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.740+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="2020-07-29T14:49:53.476+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.740+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="2020-07-29T14:49:53.477+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.740+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="2020-07-29T14:49:53.477+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.740+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="2020-07-29T14:49:53.477+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.740+02:00", comments="Source field: lms_setup.active") public static final SqlColumn active = lmsSetupRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.476+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+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 051f54cb..2fea7a2a 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="2020-07-29T14:49:53.477+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.740+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="2020-07-29T14:49:53.477+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.740+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="2020-07-29T14:49:53.477+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.740+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="2020-07-29T14:49:53.477+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.740+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), @@ -64,7 +64,7 @@ public interface LmsSetupRecordMapper { }) LmsSetupRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.477+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.743+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), @@ -83,22 +83,22 @@ public interface LmsSetupRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.477+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+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="2020-07-29T14:49:53.477+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+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="2020-07-29T14:49:53.477+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+02:00", comments="Source Table: lms_setup") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.477+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+02:00", comments="Source Table: lms_setup") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord) .where(id, isEqualTo(id_)) @@ -106,7 +106,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.477+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+02:00", comments="Source Table: lms_setup") default int insert(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -126,7 +126,7 @@ public interface LmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+02:00", comments="Source Table: lms_setup") default int insertSelective(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -146,19 +146,19 @@ public interface LmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+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, active) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+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, active) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+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, active) .from(lmsSetupRecord) @@ -167,7 +167,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+02:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExample(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -184,7 +184,7 @@ public interface LmsSetupRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+02:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExampleSelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -201,7 +201,7 @@ public interface LmsSetupRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+02:00", comments="Source Table: lms_setup") default int updateByPrimaryKey(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -221,7 +221,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.744+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 cdceb9d4..56dcab0a 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="2020-07-29T14:49:53.415+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.685+02:00", comments="Source Table: orientation") public static final OrientationRecord orientationRecord = new OrientationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.415+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.685+02:00", comments="Source field: orientation.id") public static final SqlColumn id = orientationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.416+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.685+02:00", comments="Source field: orientation.config_attribute_id") public static final SqlColumn configAttributeId = orientationRecord.configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.416+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.686+02:00", comments="Source field: orientation.template_id") public static final SqlColumn templateId = orientationRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.417+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.686+02:00", comments="Source field: orientation.view_id") public static final SqlColumn viewId = orientationRecord.viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.417+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.686+02:00", comments="Source field: orientation.group_id") public static final SqlColumn groupId = orientationRecord.groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.417+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.686+02:00", comments="Source field: orientation.x_position") public static final SqlColumn xPosition = orientationRecord.xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.417+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.686+02:00", comments="Source field: orientation.y_position") public static final SqlColumn yPosition = orientationRecord.yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.418+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.686+02:00", comments="Source field: orientation.width") public static final SqlColumn width = orientationRecord.width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.418+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+02:00", comments="Source field: orientation.height") public static final SqlColumn height = orientationRecord.height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.418+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+02:00", comments="Source field: orientation.title") public static final SqlColumn title = orientationRecord.title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.415+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.685+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 ecf39a36..cda66808 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="2020-07-29T14:49:53.418+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.418+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+02:00", comments="Source Table: orientation") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.418+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+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="2020-07-29T14:49:53.418+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+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="2020-07-29T14:49:53.418+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+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="2020-07-29T14:49:53.418+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+02:00", comments="Source Table: orientation") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.418+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+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="2020-07-29T14:49:53.418+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+02:00", comments="Source Table: orientation") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.418+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+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="2020-07-29T14:49:53.419+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+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="2020-07-29T14:49:53.419+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.687+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="2020-07-29T14:49:53.419+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.688+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="2020-07-29T14:49:53.419+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.688+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="2020-07-29T14:49:53.419+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.688+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="2020-07-29T14:49:53.419+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.688+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="2020-07-29T14:49:53.419+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.688+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="2020-07-29T14:49:53.419+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.688+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="2020-07-29T14:49:53.419+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.688+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/RoleRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java index 2be71233..eca68695 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="2020-07-29T14:49:53.481+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+02:00", comments="Source Table: user_role") public static final RoleRecord roleRecord = new RoleRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.481+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+02:00", comments="Source field: user_role.id") public static final SqlColumn id = roleRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.481+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+02:00", comments="Source field: user_role.user_id") public static final SqlColumn userId = roleRecord.userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.481+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+02:00", comments="Source field: user_role.role_name") public static final SqlColumn roleName = roleRecord.roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.481+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+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 f4efb303..25dd11cb 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="2020-07-29T14:49:53.481+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.481+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.481+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.481+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+02:00", comments="Source Table: user_role") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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="2020-07-29T14:49:53.482+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.750+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 b978e6ce..771627e0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java @@ -7,34 +7,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class SebClientConfigRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.471+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source Table: seb_client_configuration") public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.471+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.id") public static final SqlColumn id = sebClientConfigRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.471+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+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="2020-07-29T14:49:53.471+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+02:00", comments="Source field: seb_client_configuration.name") public static final SqlColumn name = sebClientConfigRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.471+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+02:00", comments="Source field: seb_client_configuration.date") public static final SqlColumn date = sebClientConfigRecord.date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.471+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+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="2020-07-29T14:49:53.471+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+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="2020-07-29T14:49:53.471+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+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="2020-07-29T14:49:53.471+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+02:00", comments="Source field: seb_client_configuration.active") public static final SqlColumn active = sebClientConfigRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.471+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+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 542638f4..414b5436 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="2020-07-29T14:49:53.471+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+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="2020-07-29T14:49:53.471+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+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="2020-07-29T14:49:53.471+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+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="2020-07-29T14:49:53.471+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface SebClientConfigRecordMapper { }) SebClientConfigRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.736+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface SebClientConfigRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+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="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+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="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+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="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+02:00", comments="Source Table: seb_client_configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+02:00", comments="Source Table: seb_client_configuration") default int insert(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -113,7 +113,7 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+02:00", comments="Source Table: seb_client_configuration") default int insertSelective(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -128,19 +128,19 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+02:00", comments="Source Table: seb_client_configuration") default SebClientConfigRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord) @@ -149,7 +149,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExample(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -161,7 +161,7 @@ public interface SebClientConfigRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExampleSelective(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -173,7 +173,7 @@ public interface SebClientConfigRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+02:00", comments="Source Table: seb_client_configuration") default int updateByPrimaryKey(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -188,7 +188,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.472+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.737+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 7117dc2c..ed6a436f 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,22 +7,22 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ThresholdRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+02:00", comments="Source Table: threshold") public static final ThresholdRecord thresholdRecord = new ThresholdRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+02:00", comments="Source field: threshold.id") public static final SqlColumn id = thresholdRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+02:00", comments="Source field: threshold.indicator_id") public static final SqlColumn indicatorId = thresholdRecord.indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+02:00", comments="Source field: threshold.value") public static final SqlColumn value = thresholdRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+02:00", comments="Source field: threshold.color") public static final SqlColumn color = thresholdRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+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 fe86b644..7bd834e2 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="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+02:00", comments="Source Table: threshold") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+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="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface ThresholdRecordMapper { }) ThresholdRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -66,22 +66,22 @@ public interface ThresholdRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.730+02:00", comments="Source Table: threshold") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+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="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+02:00", comments="Source Table: threshold") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+02:00", comments="Source Table: threshold") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord) .where(id, isEqualTo(id_)) @@ -89,7 +89,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+02:00", comments="Source Table: threshold") default int insert(ThresholdRecord record) { return insert(SqlBuilder.insert(record) .into(thresholdRecord) @@ -100,7 +100,7 @@ public interface ThresholdRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+02:00", comments="Source Table: threshold") default int insertSelective(ThresholdRecord record) { return insert(SqlBuilder.insert(record) .into(thresholdRecord) @@ -111,19 +111,19 @@ public interface ThresholdRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+02:00", comments="Source Table: threshold") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, indicatorId, value, color) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.465+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+02:00", comments="Source Table: threshold") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, indicatorId, value, color) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.466+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+02:00", comments="Source Table: threshold") default ThresholdRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, indicatorId, value, color) .from(thresholdRecord) @@ -132,7 +132,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.466+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+02:00", comments="Source Table: threshold") default UpdateDSL> updateByExample(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalTo(record::getIndicatorId) @@ -140,7 +140,7 @@ public interface ThresholdRecordMapper { .set(color).equalTo(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.466+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+02:00", comments="Source Table: threshold") default UpdateDSL> updateByExampleSelective(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalToWhenPresent(record::getIndicatorId) @@ -148,7 +148,7 @@ public interface ThresholdRecordMapper { .set(color).equalToWhenPresent(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.466+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+02:00", comments="Source Table: threshold") default int updateByPrimaryKey(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalTo(record::getIndicatorId) @@ -159,7 +159,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.466+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.731+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 178d590c..5892969e 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="2020-07-29T14:49:53.485+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source Table: user_activity_log") public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.485+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.id") public static final SqlColumn id = userActivityLogRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.485+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+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="2020-07-29T14:49:53.485+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+02:00", comments="Source field: user_activity_log.timestamp") public static final SqlColumn timestamp = userActivityLogRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.485+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.485+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.485+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.485+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+02:00", comments="Source field: user_activity_log.message") public static final SqlColumn message = userActivityLogRecord.message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.485+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+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 b0f16c07..0b45f247 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="2020-07-29T14:49:53.485+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.485+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.485+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.485+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.485+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.485+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.485+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.485+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.486+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.486+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.486+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.486+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.486+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.486+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.486+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.486+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.486+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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="2020-07-29T14:49:53.486+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.752+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 2b0fa46a..c42f0c8d 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="2020-07-29T14:49:53.479+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source Table: user") public static final UserRecord userRecord = new UserRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.id") public static final SqlColumn id = userRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.institution_id") public static final SqlColumn institutionId = userRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.uuid") public static final SqlColumn uuid = userRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.creation_date") public static final SqlColumn creationDate = userRecord.creationDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.name") public static final SqlColumn name = userRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.surname") public static final SqlColumn surname = userRecord.surname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.480+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.username") public static final SqlColumn username = userRecord.username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.480+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.password") public static final SqlColumn password = userRecord.password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.480+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.email") public static final SqlColumn email = userRecord.email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.480+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.language") public static final SqlColumn language = userRecord.language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.480+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.timezone") public static final SqlColumn timezone = userRecord.timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.480+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+02:00", comments="Source field: user.active") public static final SqlColumn active = userRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.746+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 b342bd02..e067b4fe 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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+02:00", comments="Source Table: user") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+02:00", comments="Source Table: user") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+02:00", comments="Source Table: user") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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="2020-07-29T14:49:53.480+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.747+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 ee1429b0..4841aa09 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="2020-07-29T14:49:53.409+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.682+02:00", comments="Source Table: view") public static final ViewRecord viewRecord = new ViewRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.409+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.682+02:00", comments="Source field: view.id") public static final SqlColumn id = viewRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.410+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.682+02:00", comments="Source field: view.name") public static final SqlColumn name = viewRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.410+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.682+02:00", comments="Source field: view.columns") public static final SqlColumn columns = viewRecord.columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.410+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.682+02:00", comments="Source field: view.position") public static final SqlColumn position = viewRecord.position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.410+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.682+02:00", comments="Source field: view.template_id") public static final SqlColumn templateId = viewRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.409+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.682+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 557233d9..05a9faa0 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="2020-07-29T14:49:53.410+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.682+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.410+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.682+02:00", comments="Source Table: view") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.410+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.682+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="2020-07-29T14:49:53.410+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.410+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+02:00", comments="Source Table: view") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+02:00", comments="Source Table: view") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.411+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.412+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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="2020-07-29T14:49:53.412+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.683+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 ac91a0d4..82efe350 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,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class WebserviceServerInfoRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") public static final WebserviceServerInfoRecord webserviceServerInfoRecord = new WebserviceServerInfoRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source field: webservice_server_info.id") public static final SqlColumn id = webserviceServerInfoRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source field: webservice_server_info.uuid") public static final SqlColumn uuid = webserviceServerInfoRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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="2020-07-29T14:49:53.489+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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 676bb55d..31795883 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="2020-07-29T14:49:53.489+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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="2020-07-29T14:49:53.489+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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="2020-07-29T14:49:53.489+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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="2020-07-29T14:49:53.489+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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), @@ -54,7 +54,7 @@ public interface WebserviceServerInfoRecordMapper { }) WebserviceServerInfoRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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), @@ -63,22 +63,22 @@ public interface WebserviceServerInfoRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord) .where(id, isEqualTo(id_)) @@ -86,7 +86,7 @@ public interface WebserviceServerInfoRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") default int insert(WebserviceServerInfoRecord record) { return insert(SqlBuilder.insert(record) .into(webserviceServerInfoRecord) @@ -96,7 +96,7 @@ public interface WebserviceServerInfoRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") default int insertSelective(WebserviceServerInfoRecord record) { return insert(SqlBuilder.insert(record) .into(webserviceServerInfoRecord) @@ -106,19 +106,19 @@ public interface WebserviceServerInfoRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, uuid, serviceAddress) .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, uuid, serviceAddress) .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") default WebserviceServerInfoRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, uuid, serviceAddress) .from(webserviceServerInfoRecord) @@ -127,21 +127,21 @@ public interface WebserviceServerInfoRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") default UpdateDSL> updateByExample(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalTo(record::getUuid) .set(serviceAddress).equalTo(record::getServiceAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") default UpdateDSL> updateByExampleSelective(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalToWhenPresent(record::getUuid) .set(serviceAddress).equalToWhenPresent(record::getServiceAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") default int updateByPrimaryKey(WebserviceServerInfoRecord record) { return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalTo(record::getUuid) @@ -151,7 +151,7 @@ public interface WebserviceServerInfoRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.490+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+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 3cbe687d..510a0b82 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="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+02:00", comments="Source field: additional_attributes.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+02:00", comments="Source field: additional_attributes.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+02:00", comments="Source field: additional_attributes.entity_id") private Long entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+02:00", comments="Source field: additional_attributes.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+02:00", comments="Source field: additional_attributes.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+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="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+02:00", comments="Source field: additional_attributes.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+02:00", comments="Source field: additional_attributes.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+02:00", comments="Source field: additional_attributes.entity_id") public Long getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+02:00", comments="Source field: additional_attributes.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.487+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.753+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 ff5dd854..0d1fa9a4 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,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientConnectionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.443+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.443+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.443+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.exam_user_session_id") private String examUserSessionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+02:00", comments="Source field: client_connection.client_address") private String clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+02:00", comments="Source field: client_connection.virtual_client_address") private String virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+02:00", comments="Source field: client_connection.creation_time") private Long creationTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.443+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+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, Long creationTime) { this.id = id; this.institutionId = institutionId; @@ -43,47 +43,47 @@ public class ClientConnectionRecord { this.creationTime = creationTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.443+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.443+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.exam_user_session_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.711+02:00", comments="Source field: client_connection.exam_user_session_id") public String getExamUserSessionId() { return examUserSessionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+02:00", comments="Source field: client_connection.client_address") public String getClientAddress() { return clientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+02:00", comments="Source field: client_connection.virtual_client_address") public String getVirtualClientAddress() { return virtualClientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.444+02:00", comments="Source field: client_connection.creation_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.712+02:00", comments="Source field: client_connection.creation_time") public Long getCreationTime() { return creationTime; } @@ -92,7 +92,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 4711e387..366c6f09 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="2020-07-29T14:49:53.448+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.client_connection_id") private Long clientConnectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.client_time") private Long clientTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.server_time") private Long serverTime; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.717+02:00", comments="Source field: client_event.numeric_value") private BigDecimal numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.717+02:00", comments="Source field: client_event.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.448+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.715+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="2020-07-29T14:49:53.448+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source Table: client_event") public ClientEventRecord() { super(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.448+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.id") public void setId(Long id) { this.id = id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.client_connection_id") public Long getClientConnectionId() { return clientConnectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.client_connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+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="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.type") public void setType(Integer type) { this.type = type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.client_time") public Long getClientTime() { return clientTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.client_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+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="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+02:00", comments="Source field: client_event.server_time") public Long getServerTime() { return serverTime; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.server_time") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.716+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="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.717+02:00", comments="Source field: client_event.numeric_value") public BigDecimal getNumericValue() { return numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.717+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="2020-07-29T14:49:53.449+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.717+02:00", comments="Source field: client_event.text") public String getText() { return text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.451+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.717+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 508f9465..7e79ce83 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,60 +3,78 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientInstructionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.720+02:00", comments="Source field: client_instruction.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.720+02:00", comments="Source field: client_instruction.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.720+02:00", comments="Source field: client_instruction.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.attributes") private String attributes; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source Table: client_instruction") - public ClientInstructionRecord(Long id, Long examId, String connectionToken, String type, String attributes) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.needs_confirmation") + private Integer needsConfirmation; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.timestamp") + private Long timestamp; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.720+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; this.connectionToken = connectionToken; this.type = type; this.attributes = attributes; + this.needsConfirmation = needsConfirmation; + this.timestamp = timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source field: client_instruction.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.720+02:00", comments="Source field: client_instruction.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source field: client_instruction.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.720+02:00", comments="Source field: client_instruction.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source field: client_instruction.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.720+02:00", comments="Source field: client_instruction.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source field: client_instruction.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.456+02:00", comments="Source field: client_instruction.attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.attributes") public String getAttributes() { return attributes; } + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.needs_confirmation") + public Integer getNeedsConfirmation() { + return needsConfirmation; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.721+02:00", comments="Source field: client_instruction.timestamp") + public Long getTimestamp() { + return timestamp; + } + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table client_instruction * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public String toString() { @@ -69,6 +87,8 @@ public class ClientInstructionRecord { sb.append(", connectionToken=").append(connectionToken); sb.append(", type=").append(type); sb.append(", attributes=").append(attributes); + sb.append(", needsConfirmation=").append(needsConfirmation); + sb.append(", timestamp=").append(timestamp); sb.append("]"); return sb.toString(); } @@ -77,7 +97,7 @@ public class ClientInstructionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_instruction * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public boolean equals(Object that) { @@ -95,14 +115,16 @@ public class ClientInstructionRecord { && (this.getExamId() == null ? other.getExamId() == null : this.getExamId().equals(other.getExamId())) && (this.getConnectionToken() == null ? other.getConnectionToken() == null : this.getConnectionToken().equals(other.getConnectionToken())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) - && (this.getAttributes() == null ? other.getAttributes() == null : this.getAttributes().equals(other.getAttributes())); + && (this.getAttributes() == null ? other.getAttributes() == null : this.getAttributes().equals(other.getAttributes())) + && (this.getNeedsConfirmation() == null ? other.getNeedsConfirmation() == null : this.getNeedsConfirmation().equals(other.getNeedsConfirmation())) + && (this.getTimestamp() == null ? other.getTimestamp() == null : this.getTimestamp().equals(other.getTimestamp())); } /** * This method was generated by MyBatis Generator. * This method corresponds to the database table client_instruction * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public int hashCode() { @@ -113,6 +135,8 @@ public class ClientInstructionRecord { result = prime * result + ((getConnectionToken() == null) ? 0 : getConnectionToken().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getAttributes() == null) ? 0 : getAttributes().hashCode()); + result = prime * result + ((getNeedsConfirmation() == null) ? 0 : getNeedsConfirmation().hashCode()); + result = prime * result + ((getTimestamp() == null) ? 0 : getTimestamp().hashCode()); return result; } } \ No newline at end of file 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 61c4ee04..2862797d 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="2020-07-29T14:49:53.237+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.498+02:00", comments="Source field: configuration_attribute.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.238+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.500+02:00", comments="Source field: configuration_attribute.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.238+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.500+02:00", comments="Source field: configuration_attribute.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.239+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.500+02:00", comments="Source field: configuration_attribute.parent_id") private Long parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.239+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.501+02:00", comments="Source field: configuration_attribute.resources") private String resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.239+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.501+02:00", comments="Source field: configuration_attribute.validator") private String validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.239+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.501+02:00", comments="Source field: configuration_attribute.dependencies") private String dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.241+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.503+02:00", comments="Source field: configuration_attribute.default_value") private String defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.231+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.494+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="2020-07-29T14:49:53.238+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.499+02:00", comments="Source field: configuration_attribute.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.238+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.500+02:00", comments="Source field: configuration_attribute.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.238+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.500+02:00", comments="Source field: configuration_attribute.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.239+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.500+02:00", comments="Source field: configuration_attribute.parent_id") public Long getParentId() { return parentId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.239+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.501+02:00", comments="Source field: configuration_attribute.resources") public String getResources() { return resources; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.239+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.501+02:00", comments="Source field: configuration_attribute.validator") public String getValidator() { return validator; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.239+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.503+02:00", comments="Source field: configuration_attribute.dependencies") public String getDependencies() { return dependencies; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.241+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.503+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 01a5f277..48aa594a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java @@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ConfigurationNodeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.426+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.695+02:00", comments="Source field: configuration_node.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.426+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.695+02:00", comments="Source field: configuration_node.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.695+02:00", comments="Source field: configuration_node.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.696+02:00", comments="Source field: configuration_node.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.696+02:00", comments="Source field: configuration_node.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.696+02:00", comments="Source field: configuration_node.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.696+02:00", comments="Source field: configuration_node.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.696+02:00", comments="Source field: configuration_node.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.426+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.695+02:00", comments="Source Table: configuration_node") public ConfigurationNodeRecord(Long id, Long institutionId, Long templateId, String owner, String name, String description, String type, String status) { this.id = id; this.institutionId = institutionId; @@ -39,42 +39,42 @@ public class ConfigurationNodeRecord { this.status = status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.426+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.695+02:00", comments="Source field: configuration_node.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.426+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.695+02:00", comments="Source field: configuration_node.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.695+02:00", comments="Source field: configuration_node.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.696+02:00", comments="Source field: configuration_node.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.696+02:00", comments="Source field: configuration_node.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.696+02:00", comments="Source field: configuration_node.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.696+02:00", comments="Source field: configuration_node.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.427+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.696+02:00", comments="Source field: configuration_node.status") public String getStatus() { return status; } @@ -83,7 +83,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 682b6374..fe6051a4 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="2020-07-29T14:49:53.421+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.689+02:00", comments="Source field: configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+02:00", comments="Source field: configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+02:00", comments="Source field: configuration.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+02:00", comments="Source field: configuration.version") private String version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+02:00", comments="Source field: configuration.version_date") private DateTime versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+02:00", comments="Source field: configuration.followup") private Integer followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.421+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.689+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="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.689+02:00", comments="Source field: configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+02:00", comments="Source field: configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+02:00", comments="Source field: configuration.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+02:00", comments="Source field: configuration.version") public String getVersion() { return version; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+02:00", comments="Source field: configuration.version_date") public DateTime getVersionDate() { return versionDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.422+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.690+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 18b9d0e1..ac8829cb 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="2020-07-29T14:49:53.404+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.404+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.404+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.configuration_id") private Long configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.404+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.configuration_attribute_id") private Long configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.405+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.list_index") private Integer listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.405+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.404+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+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="2020-07-29T14:49:53.404+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.404+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.404+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.configuration_id") public Long getConfigurationId() { return configurationId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.405+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.configuration_attribute_id") public Long getConfigurationAttributeId() { return configurationAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.405+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+02:00", comments="Source field: configuration_value.list_index") public Integer getListIndex() { return listIndex; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.405+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.678+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 f66545a4..d15970aa 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="2020-07-29T14:49:53.431+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.user_names") private String userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.431+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+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="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+02:00", comments="Source field: exam_configuration_map.user_names") public String getUserNames() { return userNames; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.432+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.701+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 4af0894b..32c5094d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java @@ -3,49 +3,49 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.437+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.704+02:00", comments="Source field: exam.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.437+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.704+02:00", comments="Source field: exam.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.437+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.704+02:00", comments="Source field: exam.lms_setup_id") private Long lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.437+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.external_id") private String externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.quit_password") private String quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.browser_keys") private String browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.lms_seb_restriction") private Integer lmsSebRestriction; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.updating") private Integer updating; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source field: exam.lastupdate") private String lastupdate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source field: exam.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.437+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.704+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) { this.id = id; this.institutionId = institutionId; @@ -63,72 +63,72 @@ public class ExamRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.437+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.704+02:00", comments="Source field: exam.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.437+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.704+02:00", comments="Source field: exam.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.437+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.704+02:00", comments="Source field: exam.lms_setup_id") public Long getLmsSetupId() { return lmsSetupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.external_id") public String getExternalId() { return externalId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.quit_password") public String getQuitPassword() { return quitPassword; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.browser_keys") public String getBrowserKeys() { return browserKeys; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.lms_seb_restriction") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.705+02:00", comments="Source field: exam.lms_seb_restriction") public Integer getLmsSebRestriction() { return lmsSebRestriction; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.updating") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source field: exam.updating") public Integer getUpdating() { return updating; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.438+02:00", comments="Source field: exam.lastupdate") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source field: exam.lastupdate") public String getLastupdate() { return lastupdate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.439+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.706+02:00", comments="Source field: exam.active") public Integer getActive() { return active; } @@ -137,7 +137,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public String toString() { @@ -167,7 +167,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public boolean equals(Object that) { @@ -201,7 +201,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 647018b9..fcf0b44f 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,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class IndicatorRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.460+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source field: indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.460+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source field: indicator.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.460+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source field: indicator.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.460+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source field: indicator.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.461+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source field: indicator.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.460+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.725+02:00", comments="Source Table: indicator") public IndicatorRecord(Long id, Long examId, String type, String name, String color) { this.id = id; this.examId = examId; @@ -27,27 +27,27 @@ public class IndicatorRecord { this.color = color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.460+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source field: indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.460+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source field: indicator.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.460+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source field: indicator.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.460+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source field: indicator.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.461+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.726+02:00", comments="Source field: indicator.color") public String getColor() { return color; } @@ -56,7 +56,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 f3b2c49f..2fdc5a5d 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="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.url_suffix") private String urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.theme_name") private String themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.logo_image") private String logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.467+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+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="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.url_suffix") public String getUrlSuffix() { return urlSuffix; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.theme_name") public String getThemeName() { return themeName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.467+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+02:00", comments="Source field: institution.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.468+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.732+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 239d789a..957c473d 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,46 +3,46 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class LmsSetupRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.474+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_type") private String lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_url") private String lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_clientname") private String lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_clientsecret") private String lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_rest_api_token") private String lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_proxy_host") private String lmsProxyHost; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.lms_proxy_port") private Integer lmsProxyPort; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") private String lmsProxyAuthUsername; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") private String lmsProxyAuthSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.474+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+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, Integer active) { this.id = id; this.institutionId = institutionId; @@ -59,67 +59,67 @@ public class LmsSetupRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.474+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_type") public String getLmsType() { return lmsType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_url") public String getLmsUrl() { return lmsUrl; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_clientname") public String getLmsClientname() { return lmsClientname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_clientsecret") public String getLmsClientsecret() { return lmsClientsecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_rest_api_token") public String getLmsRestApiToken() { return lmsRestApiToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_proxy_host") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.738+02:00", comments="Source field: lms_setup.lms_proxy_host") public String getLmsProxyHost() { return lmsProxyHost; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_proxy_port") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.lms_proxy_port") public Integer getLmsProxyPort() { return lmsProxyPort; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.lms_proxy_auth_username") public String getLmsProxyAuthUsername() { return lmsProxyAuthUsername; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.lms_proxy_auth_secret") public String getLmsProxyAuthSecret() { return lmsProxyAuthSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.475+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.739+02:00", comments="Source field: lms_setup.active") public Integer getActive() { return active; } @@ -128,7 +128,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public String toString() { @@ -157,7 +157,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public boolean equals(Object that) { @@ -190,7 +190,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 96bbea2a..e2c31cbf 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="2020-07-29T14:49:53.413+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.config_attribute_id") private Long configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.view_id") private Long viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.group_id") private String groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.x_position") private Integer xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.y_position") private Integer yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.685+02:00", comments="Source field: orientation.width") private Integer width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.415+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.685+02:00", comments="Source field: orientation.height") private Integer height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.415+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.685+02:00", comments="Source field: orientation.title") private String title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.413+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+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="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.config_attribute_id") public Long getConfigAttributeId() { return configAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.view_id") public Long getViewId() { return viewId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.group_id") public String getGroupId() { return groupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.x_position") public Integer getxPosition() { return xPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.414+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.684+02:00", comments="Source field: orientation.y_position") public Integer getyPosition() { return yPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.415+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.685+02:00", comments="Source field: orientation.width") public Integer getWidth() { return width; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.415+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.685+02:00", comments="Source field: orientation.height") public Integer getHeight() { return height; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.415+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.685+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 96203b0f..58ff542d 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="2020-07-29T14:49:53.481+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+02:00", comments="Source field: user_role.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.481+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+02:00", comments="Source field: user_role.user_id") private Long userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.481+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+02:00", comments="Source field: user_role.role_name") private String roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.481+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+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="2020-07-29T14:49:53.481+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+02:00", comments="Source field: user_role.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.481+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+02:00", comments="Source field: user_role.user_id") public Long getUserId() { return userId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.481+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.749+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 94043253..1b831721 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java @@ -4,31 +4,31 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class SebClientConfigRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+02:00", comments="Source field: seb_client_configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.date") private DateTime date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.client_name") private String clientName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.client_secret") private String clientSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.734+02:00", comments="Source Table: seb_client_configuration") public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, String encryptSecret, Integer active) { this.id = id; this.institutionId = institutionId; @@ -40,42 +40,42 @@ public class SebClientConfigRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.date") public DateTime getDate() { return date; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.client_name") public String getClientName() { return clientName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.client_secret") public String getClientSecret() { return clientSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.encrypt_secret") public String getEncryptSecret() { return encryptSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.470+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.735+02:00", comments="Source field: seb_client_configuration.active") public Integer getActive() { return active; } @@ -84,7 +84,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public String toString() { @@ -108,7 +108,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public boolean equals(Object that) { @@ -136,7 +136,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 3f082616..3b0b5e0f 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,19 +4,19 @@ import java.math.BigDecimal; import javax.annotation.Generated; public class ThresholdRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.729+02:00", comments="Source field: threshold.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.729+02:00", comments="Source field: threshold.indicator_id") private Long indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.729+02:00", comments="Source field: threshold.value") private BigDecimal value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.729+02:00", comments="Source field: threshold.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.729+02:00", comments="Source Table: threshold") public ThresholdRecord(Long id, Long indicatorId, BigDecimal value, String color) { this.id = id; this.indicatorId = indicatorId; @@ -24,22 +24,22 @@ public class ThresholdRecord { this.color = color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.729+02:00", comments="Source field: threshold.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.729+02:00", comments="Source field: threshold.indicator_id") public Long getIndicatorId() { return indicatorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.729+02:00", comments="Source field: threshold.value") public BigDecimal getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.464+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.729+02:00", comments="Source field: threshold.color") public String getColor() { return color; } @@ -48,7 +48,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public String toString() { @@ -68,7 +68,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public boolean equals(Object that) { @@ -92,7 +92,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 7a50d068..65f44e38 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="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.user_uuid") private String userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.activity_type") private String activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.entity_id") private String entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.message") private String message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+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="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.user_uuid") public String getUserUuid() { return userUuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.activity_type") public String getActivityType() { return activityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+02:00", comments="Source field: user_activity_log.entity_id") public String getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.484+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.751+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 1e164179..7efaceb7 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="2020-07-29T14:49:53.478+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.creation_date") private DateTime creationDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.surname") private String surname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.username") private String username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.password") private String password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.email") private String email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.language") private String language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.timezone") private String timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+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="2020-07-29T14:49:53.478+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.478+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.creation_date") public DateTime getCreationDate() { return creationDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.surname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.surname") public String getSurname() { return surname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.username") public String getUsername() { return username; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.password") public String getPassword() { return password; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.email") public String getEmail() { return email; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.language") public String getLanguage() { return language; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+02:00", comments="Source field: user.timezone") public String getTimezone() { return timezone; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.479+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.745+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 fe73188e..512dc814 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="2020-07-29T14:49:53.408+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+02:00", comments="Source field: view.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.408+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+02:00", comments="Source field: view.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.409+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+02:00", comments="Source field: view.columns") private Integer columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.409+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+02:00", comments="Source field: view.position") private Integer position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.409+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+02:00", comments="Source field: view.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.408+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+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="2020-07-29T14:49:53.408+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+02:00", comments="Source field: view.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.408+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+02:00", comments="Source field: view.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.409+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+02:00", comments="Source field: view.columns") public Integer getColumns() { return columns; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.409+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+02:00", comments="Source field: view.position") public Integer getPosition() { return position; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.409+02:00", comments="Source field: view.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.681+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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @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 1a714529..51485ddf 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,33 +3,33 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class WebserviceServerInfoRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source field: webservice_server_info.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source field: webservice_server_info.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source field: webservice_server_info.service_address") private String serviceAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source Table: webservice_server_info") public WebserviceServerInfoRecord(Long id, String uuid, String serviceAddress) { this.id = id; this.uuid = uuid; this.serviceAddress = serviceAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source field: webservice_server_info.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source field: webservice_server_info.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-07-29T14:49:53.489+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-08-11T12:03:38.755+02:00", comments="Source field: webservice_server_info.service_address") public String getServiceAddress() { return serviceAddress; } @@ -38,7 +38,7 @@ public class WebserviceServerInfoRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public String toString() { @@ -57,7 +57,7 @@ public class WebserviceServerInfoRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public boolean equals(Object that) { @@ -80,7 +80,7 @@ public class WebserviceServerInfoRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Wed Jul 29 14:49:53 CEST 2020 + * @mbg.generated Tue Aug 11 12:03:38 CEST 2020 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientConnectionDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientConnectionDAO.java index 5e3a2223..d2a6be52 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientConnectionDAO.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientConnectionDAO.java @@ -75,4 +75,7 @@ public interface ClientConnectionDAO extends * @return Result refer to the ClientConnection for the specified connection token or to an error if happened */ Result byConnectionToken(String connectionToken); + Result isActiveConnection(Long examId, String connectionToken); + + Result> filterActive(Long examId, Set connectionToken); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientInstructionDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientInstructionDAO.java index 7c9cd6f6..63c22926 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientInstructionDAO.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ClientInstructionDAO.java @@ -20,7 +20,8 @@ public interface ClientInstructionDAO { Long examId, InstructionType type, String attributes, - String connectionTokens); + String connectionTokens, + boolean needsConfirmation); Result> getAllActive(); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java index e5b2e858..361051a4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientConnectionDAOImpl.java @@ -285,6 +285,41 @@ public class ClientConnectionDAOImpl implements ClientConnectionDAO { .flatMap(ClientConnectionDAOImpl::toDomainModel); } + @Override + public Result isActiveConnection(final Long examId, final String connectionToken) { + return Result.tryCatch(() -> this.clientConnectionRecordMapper + .selectByExample() + .where( + ClientConnectionRecordDynamicSqlSupport.connectionToken, + SqlBuilder.isEqualTo(connectionToken)) + .and( + ClientConnectionRecordDynamicSqlSupport.examId, + SqlBuilder.isEqualTo(examId)) + .build() + .execute() + .stream() + .findFirst() + .isPresent()); + } + + @Override + public Result> filterActive(final Long examId, final Set connectionToken) { + return Result.tryCatch(() -> this.clientConnectionRecordMapper + .selectByExample() + .where( + ClientConnectionRecordDynamicSqlSupport.connectionToken, + SqlBuilder.isIn(new ArrayList<>(connectionToken))) + .and( + ClientConnectionRecordDynamicSqlSupport.examId, + SqlBuilder.isEqualTo(examId)) + .build() + .execute() + .stream() + .filter(cc -> ConnectionStatus.ACTIVE.name() == cc.getStatus()) + .map(ClientConnectionRecord::getConnectionToken) + .collect(Collectors.toSet())); + } + private Result recordById(final Long id) { return Result.tryCatch(() -> { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientInstructionDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientInstructionDAOImpl.java index 6f6b458e..e5b1bcf3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientInstructionDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ClientInstructionDAOImpl.java @@ -9,11 +9,18 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.dao.impl; import java.util.Collection; +import java.util.Map; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.JSONMapper; import ch.ethz.seb.sebserver.gbl.model.session.ClientInstruction.InstructionType; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Result; @@ -27,9 +34,14 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientInstructionDAO; public class ClientInstructionDAOImpl implements ClientInstructionDAO { private final ClientInstructionRecordMapper clientInstructionRecordMapper; + private final JSONMapper jsonMapper; + + protected ClientInstructionDAOImpl( + final ClientInstructionRecordMapper clientInstructionRecordMapper, + final JSONMapper jsonMapper) { - protected ClientInstructionDAOImpl(final ClientInstructionRecordMapper clientInstructionRecordMapper) { this.clientInstructionRecordMapper = clientInstructionRecordMapper; + this.jsonMapper = jsonMapper; } @Override @@ -57,7 +69,8 @@ public class ClientInstructionDAOImpl implements ClientInstructionDAO { final Long examId, final InstructionType type, final String attributes, - final String connectionToken) { + final String connectionToken, + final boolean needsConfirmation) { return Result.tryCatch(() -> { final ClientInstructionRecord clientInstructionRecord = new ClientInstructionRecord( @@ -65,9 +78,34 @@ public class ClientInstructionDAOImpl implements ClientInstructionDAO { examId, connectionToken, type.name(), - attributes); + attributes, + (needsConfirmation) ? 1 : 0, + DateTime.now(DateTimeZone.UTC).getMillis()); this.clientInstructionRecordMapper.insert(clientInstructionRecord); + + if (needsConfirmation) { + + final Map attrs = this.jsonMapper.readValue( + attributes, + new TypeReference>() { + }); + attrs.put(API.EXAM_API_PING_INSTRUCTION_CONFIRM, String.valueOf(clientInstructionRecord.getId())); + + this.clientInstructionRecordMapper.updateByPrimaryKeySelective( + new ClientInstructionRecord( + clientInstructionRecord.getId(), + null, + null, + null, + this.jsonMapper.writeValueAsString(attrs), + null, + null)); + + return this.clientInstructionRecordMapper + .selectByPrimaryKey(clientInstructionRecord.getId()); + } + return clientInstructionRecord; }); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/SEBClientConnectionService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/SEBClientConnectionService.java index bb6d0393..1daea052 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/SEBClientConnectionService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/SEBClientConnectionService.java @@ -137,4 +137,10 @@ public interface SEBClientConnectionService { * @param event The SEB client event data */ void notifyClientEvent(String connectionToken, final ClientEvent event); + /** This is used to confirm SEB instructions that must be confirmed by the SEB client. + * + * @param connectionToken The SEB client connection token + * @param instructionConfirm the instruction confirm identifier */ + void confirmInstructionDone(String connectionToken, String instructionConfirm); + } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/SEBInstructionService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/SEBInstructionService.java index 20c87597..e4cb9a29 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/SEBInstructionService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/SEBInstructionService.java @@ -34,16 +34,29 @@ public interface SEBInstructionService { /** Used to register a SEB client instruction for one or more active client connections * - * @param clientInstruction the ClientInstruction instance to register */ - default Result registerInstruction(final ClientInstruction clientInstruction) { - return Result.tryCatch(() -> registerInstruction( + * @param clientInstruction the ClientInstruction instance to register + * @return A Result refer to a void marker or to an error if happened */ + default Result registerInstruction(final ClientInstruction clientInstructionn) { + return registerInstruction(clientInstructionn, false); + } + + /** Used to register a SEB client instruction for one or more active client connections + * + * @param clientInstruction the ClientInstruction instance to register + * @param needsConfirm indicates whether the SEB instruction needs a confirmation or not + * @return A Result refer to a void marker or to an error if happened */ + default Result registerInstruction( + final ClientInstruction clientInstruction, + final boolean needsConfirmation) { + + return registerInstruction( clientInstruction.examId, clientInstruction.type, clientInstruction.attributes, new HashSet<>(Arrays.asList(StringUtils.split( clientInstruction.connectionToken, - Constants.LIST_SEPARATOR)))) - .getOrThrow()); + Constants.LIST_SEPARATOR))), + needsConfirmation); } /** Used to register a SEB client instruction for one or more active client connections @@ -51,13 +64,30 @@ public interface SEBInstructionService { * @param examId The exam identifier * @param type The InstructionType * @param attributes The instruction's attributes - * @param connectionTokens A Set of connectionTokens to register the instruction for. + * @param connectionToken a connectionToken to register the instruction for. + * @param needsConfirm indicates whether the SEB instruction needs a confirmation or not * @return A Result refer to a void marker or to an error if happened */ Result registerInstruction( final Long examId, InstructionType type, Map attributes, - Set connectionTokens); + String connectionToken, + boolean needsConfirm); + + /** Used to register a SEB client instruction for one or more active client connections + * + * @param examId The exam identifier + * @param type The InstructionType + * @param attributes The instruction's attributes + * @param connectionTokens A Set of connectionTokens to register the instruction for. + * @param needsConfirm indicates whether the SEB instruction needs a confirmation or not + * @return A Result refer to a void marker or to an error if happened */ + Result registerInstruction( + final Long examId, + InstructionType type, + Map attributes, + Set connectionTokens, + boolean needsConfirm); /** Get a SEB instruction for the specified SEB Client connection or null of there * is currently no SEB instruction in the queue. @@ -69,4 +99,10 @@ public interface SEBInstructionService { * @return SEB instruction to sent to the SEB Client or null */ String getInstructionJSON(final String connectionToken); + /** This is used to confirm SEB instructions that must be confirmed by the SEB client. + * + * @param connectionToken The SEB client connection token + * @param instructionConfirm the instruction confirm identifier */ + void confirmInstructionDone(String connectionToken, String instructionConfirm); + } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java index a87ea238..a1e81cf0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java @@ -9,6 +9,8 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl; import java.security.Principal; +import java.util.HashMap; +import java.util.Map; import java.util.Objects; import java.util.UUID; import java.util.function.Predicate; @@ -24,16 +26,22 @@ import org.springframework.stereotype.Service; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamType; +import ch.ethz.seb.sebserver.gbl.model.exam.ProctoringSettings; +import ch.ethz.seb.sebserver.gbl.model.exam.ProctoringSettings.ServerType; +import ch.ethz.seb.sebserver.gbl.model.exam.SEBClientProctoringConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent; +import ch.ethz.seb.sebserver.gbl.model.session.ClientInstruction; +import ch.ethz.seb.sebserver.gbl.model.session.ClientInstruction.InstructionType; 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.ClientConnectionDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.SEBClientConfigDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.exam.ExamAdminService; import ch.ethz.seb.sebserver.webservice.servicelayer.session.EventHandlingStrategy; import ch.ethz.seb.sebserver.webservice.servicelayer.session.ExamSessionService; import ch.ethz.seb.sebserver.webservice.servicelayer.session.PingHandlingStrategy; @@ -57,13 +65,15 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic private final SEBClientConfigDAO sebClientConfigDAO; private final SEBInstructionService sebInstructionService; private final WebserviceInfo webserviceInfo; + private final ExamAdminService examAdminService; protected SEBClientConnectionServiceImpl( final ExamSessionService examSessionService, final EventHandlingStrategyFactory eventHandlingStrategyFactory, final PingHandlingStrategyFactory pingHandlingStrategyFactory, final SEBClientConfigDAO sebClientConfigDAO, - final SEBInstructionService sebInstructionService) { + final SEBInstructionService sebInstructionService, + final ExamAdminService examAdminService) { this.examSessionService = examSessionService; this.examSessionCacheService = examSessionService.getExamSessionCacheService(); @@ -74,6 +84,7 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic this.sebClientConfigDAO = sebClientConfigDAO; this.sebInstructionService = sebInstructionService; this.webserviceInfo = sebInstructionService.getWebserviceInfo(); + this.examAdminService = examAdminService; } @Override @@ -331,10 +342,68 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic updatedClientConnection.id, connectionToken); + postHandshakeProcessing(updatedClientConnection); + return updatedClientConnection; }); } + private void postHandshakeProcessing(final ClientConnection clientConnection) { + // check if proctoring is enabled for the involved exam + try { + final Boolean proctoringEnabled = this.examAdminService + .isExamProctoringEnabled(clientConnection.examId) + .getOrThrow(); + if (BooleanUtils.isTrue(proctoringEnabled)) { + // apply a SEB_PROCOTIRNG instruction for the specified SEB client connection + final ProctoringSettings proctoringSettings = this.examAdminService + .getExamProctoring(clientConnection.examId) + .getOrThrow(); + + final SEBClientProctoringConnectionData proctoringData = + this.examAdminService.getExamProctoringService(proctoringSettings.serverType) + .flatMap(s -> s.createProctoringConnectionData( + proctoringSettings, + clientConnection.connectionToken, + false)) + .getOrThrow(); + + final Map attributes = new HashMap<>(); + attributes.put( + ClientInstruction.SEB_INSTRUCTION_ATTRIBUTES.SEB_PROCTORING.SERVICE_TYPE, + ServerType.JITSI_MEET.name()); + attributes.put( + ClientInstruction.SEB_INSTRUCTION_ATTRIBUTES.SEB_PROCTORING.METHOD, + "join"); + + if (proctoringSettings.serverType == ServerType.JITSI_MEET) { + + attributes.put( + ClientInstruction.SEB_INSTRUCTION_ATTRIBUTES.SEB_PROCTORING.JITSI_ROOM, + proctoringData.roomName); + attributes.put( + ClientInstruction.SEB_INSTRUCTION_ATTRIBUTES.SEB_PROCTORING.JITSI_URL, + proctoringData.serverURL); + attributes.put( + ClientInstruction.SEB_INSTRUCTION_ATTRIBUTES.SEB_PROCTORING.JITSI_TOKEN, + proctoringData.accessToken); + } + + this.sebInstructionService.registerInstruction( + clientConnection.examId, + InstructionType.SEB_PROCTORING, + attributes, + clientConnection.connectionToken, + true); + + } + } catch (final Exception e) { + log.error( + "Failed to process proctoring initialization for established SEB client connection: {}", + clientConnection.connectionToken); + } + } + @Override public Result closeConnection( final String connectionToken, @@ -491,6 +560,11 @@ public class SEBClientConnectionServiceImpl implements SEBClientConnectionServic } } + @Override + public void confirmInstructionDone(final String connectionToken, final String instructionConfirm) { + this.sebInstructionService.confirmInstructionDone(connectionToken, instructionConfirm); + } + private void checkExamRunning(final Long examId) { if (examId != null && !this.examSessionService.isExamRunning(examId)) { examNotRunningException(examId); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBInstructionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBInstructionServiceImpl.java index a2e400ed..98bca872 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBInstructionServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBInstructionServiceImpl.java @@ -9,12 +9,12 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl; import java.util.Collections; -import java.util.HashSet; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -92,19 +92,43 @@ public class SEBInstructionServiceImpl implements SEBInstructionService { final Long examId, final InstructionType type, final Map attributes, - final Set connectionTokens) { + final String connectionToken, + final boolean needsConfirm) { + + return Result.tryCatch(() -> { + final boolean isActive = this.clientConnectionDAO + .isActiveConnection(examId, connectionToken) + .getOr(false); + if (isActive) { + final String attributesString = Utils.toJsonArrayValue(attributes); + this.clientInstructionDAO + .insert(examId, type, attributesString, connectionToken, needsConfirm) + .map(inst -> this.instructions.putIfAbsent(inst.getConnectionToken(), inst)) + .onError(error -> log.error("Failed to put instruction: ", error)) + .getOrThrow(); + } + }); + } + + @Override + public Result registerInstruction( + final Long examId, + final InstructionType type, + final Map attributes, + final Set connectionTokens, + final boolean needsConfirm) { return Result.tryCatch(() -> { final String attributesString = Utils.toJsonArrayValue(attributes); - final Set activeConnections = new HashSet<>(this.clientConnectionDAO - .getConnectionTokens(examId) - .getOrElse(Collections::emptyList)); + final Set activeConnections = this.clientConnectionDAO + .filterActive(examId, connectionTokens) + .getOrElse(Collections::emptySet); connectionTokens .stream() .filter(activeConnections::contains) - .map(token -> this.clientInstructionDAO.insert(examId, type, attributesString, token)) + .map(token -> this.clientInstructionDAO.insert(examId, type, attributesString, token, needsConfirm)) .map(result -> result.get( error -> log.error("Failed to put instruction: ", error), () -> null)) @@ -121,42 +145,59 @@ public class SEBInstructionServiceImpl implements SEBInstructionService { return null; } - final ClientInstructionRecord clientInstruction = this.instructions.remove(connectionToken); - if (clientInstruction != null) { + if (!this.instructions.containsKey(connectionToken)) { + return null; + } + + final ClientInstructionRecord clientInstruction = this.instructions.get(connectionToken); + + if (!BooleanUtils.toBoolean(clientInstruction.getNeedsConfirmation())) { + this.instructions.remove(connectionToken); final Result delete = this.clientInstructionDAO.delete(clientInstruction.getId()); if (delete.hasError()) { log.error("Failed to delete SEB client instruction on persistent storage: ", delete.getError()); } - - // {"instruction":"%s", "attributes":%s} - final String attributes = clientInstruction.getAttributes(); - final StringBuilder sBuilder = new StringBuilder() - .append(Constants.CURLY_BRACE_OPEN) - .append(Constants.DOUBLE_QUOTE) - .append(JSON_INST) - .append(Constants.DOUBLE_QUOTE) - .append(Constants.COLON) - .append(Constants.DOUBLE_QUOTE) - .append(clientInstruction.getType()) - .append(Constants.DOUBLE_QUOTE); - - if (StringUtils.isNotBlank(attributes)) { - sBuilder.append(Constants.COMMA) - .append(Constants.DOUBLE_QUOTE) - .append(JSON_ATTR) - .append(Constants.DOUBLE_QUOTE) - .append(Constants.COLON) - .append(Constants.CURLY_BRACE_OPEN) - .append(attributes) - .append(Constants.CURLY_BRACE_CLOSE); - } - - return sBuilder - .append(Constants.CURLY_BRACE_CLOSE) - .toString(); } - return null; + // {"instruction":"%s", "attributes":%s} + final String attributes = clientInstruction.getAttributes(); + final StringBuilder sBuilder = new StringBuilder() + .append(Constants.CURLY_BRACE_OPEN) + .append(Constants.DOUBLE_QUOTE) + .append(JSON_INST) + .append(Constants.DOUBLE_QUOTE) + .append(Constants.COLON) + .append(Constants.DOUBLE_QUOTE) + .append(clientInstruction.getType()) + .append(Constants.DOUBLE_QUOTE); + + if (StringUtils.isNotBlank(attributes)) { + sBuilder.append(Constants.COMMA) + .append(Constants.DOUBLE_QUOTE) + .append(JSON_ATTR) + .append(Constants.DOUBLE_QUOTE) + .append(Constants.COLON) + .append(Constants.CURLY_BRACE_OPEN) + .append(attributes) + .append(Constants.CURLY_BRACE_CLOSE); + } + + return sBuilder + .append(Constants.CURLY_BRACE_CLOSE) + .toString(); + } + + @Override + public void confirmInstructionDone(final String connectionToken, final String instructionConfirm) { + try { + this.instructions.remove(connectionToken); + this.clientInstructionDAO.delete(Long.valueOf(instructionConfirm)); + } catch (final Exception e) { + log.error( + "Failed to remove SEB instruction after confirmation: connectionToken: {} instructionConfirm: {}", + connectionToken, + instructionConfirm); + } } private void refreshCache() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java index 9917fb2f..bd279f6b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java @@ -280,6 +280,7 @@ public class ExamAPI_V1_Controller { final String connectionToken = request.getHeader(API.EXAM_API_SEB_CONNECTION_TOKEN); final String timeStampString = request.getParameter(API.EXAM_API_PING_TIMESTAMP); final String pingNumString = request.getParameter(API.EXAM_API_PING_NUMBER); + final String instructionConfirm = request.getParameter(API.EXAM_API_PING_INSTRUCTION_CONFIRM); final String instruction = this.sebClientConnectionService .notifyPing( @@ -287,6 +288,10 @@ public class ExamAPI_V1_Controller { Long.parseLong(timeStampString), pingNumString != null ? Integer.parseInt(pingNumString) : -1); + if (instructionConfirm != null) { + this.sebClientConnectionService.confirmInstructionDone(connectionToken, instructionConfirm); + } + if (instruction == null) { response.setStatus(HttpStatus.NO_CONTENT.value()); return; diff --git a/src/main/resources/config/sql/base/V3_1__add_instruction_column_v1_1.sql b/src/main/resources/config/sql/base/V3_1__add_instruction_column_v1_1.sql new file mode 100644 index 00000000..bca7bc1e --- /dev/null +++ b/src/main/resources/config/sql/base/V3_1__add_instruction_column_v1_1.sql @@ -0,0 +1,3 @@ +ALTER TABLE `client_instruction` +ADD COLUMN IF NOT EXISTS `needs_confirmation` INT(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `attributes`, +ADD COLUMN IF NOT EXISTS `timestamp` BIGINT UNSIGNED NOT NULL DEFAULT 0 AFTER `needs_confirmation`; \ No newline at end of file diff --git a/src/test/resources/schema-test.sql b/src/test/resources/schema-test.sql index 967025fb..149ace1a 100644 --- a/src/test/resources/schema-test.sql +++ b/src/test/resources/schema-test.sql @@ -523,6 +523,8 @@ CREATE TABLE IF NOT EXISTS `client_instruction` ( `connection_token` VARCHAR(255) NOT NULL, `type` VARCHAR(45) NOT NULL, `attributes` VARCHAR(4000) NULL, + `needs_confirmation` INT(1) UNSIGNED NOT NULL DEFAULT 0, + `timestamp` BIGINT UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id`), INDEX `instructionExamRef_idx` (`exam_id` ASC), INDEX `instructionConnectionRef` (`connection_token` ASC),