From 2ba0045c60e7028ad7a0019b05ea141f04bbc3da Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 7 Mar 2019 16:43:51 +0100 Subject: [PATCH] SEBSERV-29 SEBSERV-30 changed the strategy to handle seb client credentials and configs as discussed in the dev-meeting. seb client credentials and configa are now managed on institution level rather then on LmsSetup level. --- .../seb/sebserver/gbl/api/EntityType.java | 3 +- .../ethz/seb/sebserver/gbl/model/Domain.java | 17 +- .../gbl/model/institution/Institution.java | 14 +- .../gbl/model/institution/LmsSetup.java | 27 +-- .../sebserver/gui/content/LmsSetupForm.java | 10 - ...AdditionalAttributesDynamicSqlSupport.java | 14 +- .../mapper/AdditionalAttributesMapper.java | 36 +-- ...ientConnectionRecordDynamicSqlSupport.java | 20 +- .../mapper/ClientConnectionRecordMapper.java | 36 +-- .../ClientEventRecordDynamicSqlSupport.java | 18 +- .../batis/mapper/ClientEventRecordMapper.java | 36 +-- ...ationAttributeRecordDynamicSqlSupport.java | 20 +- .../ConfigurationAttributeRecordMapper.java | 36 +-- ...figurationNodeRecordDynamicSqlSupport.java | 20 +- .../mapper/ConfigurationNodeRecordMapper.java | 36 +-- .../ConfigurationRecordDynamicSqlSupport.java | 14 +- .../mapper/ConfigurationRecordMapper.java | 36 +-- ...igurationValueRecordDynamicSqlSupport.java | 16 +- .../ConfigurationValueRecordMapper.java | 36 +-- ...nfigurationMapRecordDynamicSqlSupport.java | 12 +- .../ExamConfigurationMapRecordMapper.java | 36 +-- .../mapper/ExamRecordDynamicSqlSupport.java | 24 +- .../batis/mapper/ExamRecordMapper.java | 36 +-- .../IndicatorRecordDynamicSqlSupport.java | 14 +- .../batis/mapper/IndicatorRecordMapper.java | 36 +-- .../InstitutionRecordDynamicSqlSupport.java | 19 +- .../batis/mapper/InstitutionRecordMapper.java | 50 +++-- .../LmsSetupRecordDynamicSqlSupport.java | 32 +-- .../batis/mapper/LmsSetupRecordMapper.java | 58 ++--- .../OrientationRecordDynamicSqlSupport.java | 22 +- .../batis/mapper/OrientationRecordMapper.java | 36 +-- .../mapper/RoleRecordDynamicSqlSupport.java | 10 +- .../batis/mapper/RoleRecordMapper.java | 36 +-- ...entCredentialsRecordDynamicSqlSupport.java | 54 +++++ .../SebClientCredentialsRecordMapper.java | 206 ++++++++++++++++++ .../ThresholdRecordDynamicSqlSupport.java | 12 +- .../batis/mapper/ThresholdRecordMapper.java | 36 +-- ...serActivityLogRecordDynamicSqlSupport.java | 18 +- .../mapper/UserActivityLogRecordMapper.java | 36 +-- .../mapper/UserRecordDynamicSqlSupport.java | 24 +- .../batis/mapper/UserRecordMapper.java | 36 +-- .../batis/model/AdditionalAttributes.java | 28 +-- .../batis/model/ClientConnectionRecord.java | 40 ++-- .../batis/model/ClientEventRecord.java | 36 +-- .../model/ConfigurationAttributeRecord.java | 40 ++-- .../batis/model/ConfigurationNodeRecord.java | 40 ++-- .../batis/model/ConfigurationRecord.java | 28 +-- .../batis/model/ConfigurationValueRecord.java | 32 +-- .../model/ExamConfigurationMapRecord.java | 24 +- .../datalayer/batis/model/ExamRecord.java | 48 ++-- .../batis/model/IndicatorRecord.java | 28 +-- .../batis/model/InstitutionRecord.java | 42 ++-- .../datalayer/batis/model/LmsSetupRecord.java | 70 ++---- .../batis/model/OrientationRecord.java | 44 ++-- .../datalayer/batis/model/RoleRecord.java | 20 +- .../model/SebClientCredentialsRecord.java | 143 ++++++++++++ .../batis/model/ThresholdRecord.java | 24 +- .../batis/model/UserActivityLogRecord.java | 36 +-- .../datalayer/batis/model/UserRecord.java | 48 ++-- .../servicelayer/dao/LmsSetupDAO.java | 2 - .../dao/impl/InstitutionDAOImpl.java | 5 +- .../dao/impl/LmsSetupDAOImpl.java | 32 +-- .../weblayer/api/LmsSetupController.java | 93 ++++---- .../oauth/WebClientDetailsService.java | 4 +- src/main/resources/data-demo.sql | 16 +- src/main/resources/schema-demo.sql | 50 +++-- src/main/resources/schema-dev.sql | 31 ++- .../model/institution/InstitutionTest.java | 8 +- .../gbl/model/institution/LmsSetupTest.java | 2 +- .../api/admin/InstitutionAPITest.java | 2 +- .../api/admin/LmsSetupAPITest.java | 51 +---- src/test/resources/data-test.sql | 6 +- src/test/resources/schema-test.sql | 32 ++- 73 files changed, 1366 insertions(+), 1027 deletions(-) create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientCredentialsRecordDynamicSqlSupport.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientCredentialsRecordMapper.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientCredentialsRecord.java 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 42a5cb78..757836d8 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="2019-02-25T10:55:53.580+01:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-03-07T15:53:05.623+01:00") public enum EntityType { CONFIGURATION_ATTRIBUTE, CONFIGURATION_VALUE, @@ -16,6 +16,7 @@ public enum EntityType { INDICATOR, THRESHOLD, INSTITUTION, + SEB_CLIENT_CREDENTIALS, LMS_SETUP, USER, USER_ROLE, 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 07df746e..c06fa42c 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="2019-02-25T10:55:53.537+01:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-03-07T15:53:05.523+01:00") public interface Domain { interface CONFIGURATION_ATTRIBUTE { @@ -143,10 +143,23 @@ public interface Domain { String ATTR_ID = "id"; String ATTR_NAME = "name"; String ATTR_URL_SUFFIX = "urlSuffix"; + String ATTR_THEME_NAME = "themeName"; String ATTR_ACTIVE = "active"; String ATTR_LOGO_IMAGE = "logoImage"; } + interface SEB_CLIENT_CREDENTIALS { + String TYPE_NAME = "SebClientCredentials"; + String REFERENCE_NAME = "sebClientCredentialss"; + String ATTR_ID = "id"; + String ATTR_INSTITUTION_ID = "institutionId"; + String ATTR_NAME = "name"; + String ATTR_DATE = "date"; + String ATTR_CLIENT_NAME = "clientName"; + String ATTR_CLIENT_SECRET = "clientSecret"; + String ATTR_ACTIVE = "active"; + } + interface LMS_SETUP { String TYPE_NAME = "LmsSetup"; String REFERENCE_NAME = "lmsSetups"; @@ -158,8 +171,6 @@ public interface Domain { String ATTR_LMS_CLIENTNAME = "lmsClientname"; String ATTR_LMS_CLIENTSECRET = "lmsClientsecret"; String ATTR_LMS_REST_API_TOKEN = "lmsRestApiToken"; - String ATTR_SEB_CLIENTNAME = "sebClientname"; - String ATTR_SEB_CLIENTSECRET = "sebClientsecret"; String ATTR_ACTIVE = "active"; } diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/Institution.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/Institution.java index f40a8ec5..f481dd92 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/Institution.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/Institution.java @@ -40,6 +40,9 @@ public final class Institution implements GrantEntity, Activatable { @JsonProperty(INSTITUTION.ATTR_LOGO_IMAGE) public final String logoImage; + @JsonProperty(INSTITUTION.ATTR_THEME_NAME) + public final String themeName; + @JsonProperty(INSTITUTION.ATTR_ACTIVE) public final Boolean active; @@ -49,12 +52,14 @@ public final class Institution implements GrantEntity, Activatable { @JsonProperty(INSTITUTION.ATTR_NAME) final String name, @JsonProperty(INSTITUTION.ATTR_URL_SUFFIX) final String urlSuffix, @JsonProperty(INSTITUTION.ATTR_LOGO_IMAGE) final String logoImage, + @JsonProperty(INSTITUTION.ATTR_THEME_NAME) final String themeName, @JsonProperty(INSTITUTION.ATTR_ACTIVE) final Boolean active) { this.id = id; this.name = name; this.urlSuffix = urlSuffix; this.logoImage = logoImage; + this.themeName = themeName; this.active = active; } @@ -63,6 +68,7 @@ public final class Institution implements GrantEntity, Activatable { this.name = mapper.getString(INSTITUTION.ATTR_NAME); this.urlSuffix = mapper.getString(INSTITUTION.ATTR_URL_SUFFIX); this.logoImage = mapper.getString(INSTITUTION.ATTR_LOGO_IMAGE); + this.themeName = mapper.getString(INSTITUTION.ATTR_THEME_NAME); this.active = false; } @@ -106,6 +112,10 @@ public final class Institution implements GrantEntity, Activatable { return this.logoImage; } + public String getThemeName() { + return this.themeName; + } + public Boolean getActive() { return this.active; } @@ -114,11 +124,11 @@ public final class Institution implements GrantEntity, Activatable { public String toString() { return "Institution [id=" + this.id + ", name=" + this.name + ", urlSuffix=" + this.urlSuffix + ", logoImage=" + this.logoImage - + ", active=" + this.active + "]"; + + ", themeName=" + this.themeName + ", active=" + this.active + "]"; } public static Institution createNew() { - return new Institution(null, null, null, null, false); + return new Institution(null, null, null, null, null, false); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetup.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetup.java index 57070518..48157e92 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetup.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetup.java @@ -13,6 +13,7 @@ import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.seb.sebserver.gbl.api.EntityType; @@ -63,17 +64,12 @@ public final class LmsSetup implements GrantEntity, Activatable { @JsonProperty(LMS_SETUP.ATTR_LMS_REST_API_TOKEN) public final String lmsRestApiToken; - @JsonProperty(LMS_SETUP.ATTR_SEB_CLIENTNAME) - public final String sebAuthName; - - @JsonProperty(LMS_SETUP.ATTR_SEB_CLIENTSECRET) - public final String sebAuthSecret; - /** Indicates whether this LmsSetup is active or not */ @JsonProperty(LMS_SETUP.ATTR_ACTIVE) public final Boolean active; @JsonCreator + @JsonIgnoreProperties(ignoreUnknown = true) public LmsSetup( @JsonProperty(LMS_SETUP.ATTR_ID) final Long id, @JsonProperty(LMS_SETUP.ATTR_INSTITUTION_ID) final Long institutionId, @@ -83,8 +79,6 @@ public final class LmsSetup implements GrantEntity, Activatable { @JsonProperty(LMS_SETUP.ATTR_LMS_CLIENTSECRET) final String lmsAuthSecret, @JsonProperty(LMS_SETUP.ATTR_LMS_URL) final String lmsApiUrl, @JsonProperty(LMS_SETUP.ATTR_LMS_REST_API_TOKEN) final String lmsRestApiToken, - @JsonProperty(LMS_SETUP.ATTR_SEB_CLIENTNAME) final String sebAuthName, - @JsonProperty(LMS_SETUP.ATTR_SEB_CLIENTSECRET) final String sebAuthSecret, @JsonProperty(INSTITUTION.ATTR_ACTIVE) final Boolean active) { this.id = id; @@ -95,8 +89,6 @@ public final class LmsSetup implements GrantEntity, Activatable { this.lmsAuthSecret = lmsAuthSecret; this.lmsApiUrl = lmsApiUrl; this.lmsRestApiToken = lmsRestApiToken; - this.sebAuthName = sebAuthName; - this.sebAuthSecret = sebAuthSecret; this.active = (active != null) ? active : Boolean.FALSE; } @@ -109,8 +101,6 @@ public final class LmsSetup implements GrantEntity, Activatable { this.lmsAuthSecret = mapper.getString(LMS_SETUP.ATTR_LMS_CLIENTSECRET); this.lmsApiUrl = mapper.getString(LMS_SETUP.ATTR_LMS_URL); this.lmsRestApiToken = mapper.getString(LMS_SETUP.ATTR_LMS_REST_API_TOKEN); - this.sebAuthName = mapper.getString(LMS_SETUP.ATTR_SEB_CLIENTNAME); - this.sebAuthSecret = mapper.getString(LMS_SETUP.ATTR_SEB_CLIENTSECRET); this.active = mapper.getBooleanObject(LMS_SETUP.ATTR_ACTIVE); } @@ -172,14 +162,6 @@ public final class LmsSetup implements GrantEntity, Activatable { return this.lmsRestApiToken; } - public String getSebAuthName() { - return this.sebAuthName; - } - - public String getSebAuthSecret() { - return this.sebAuthSecret; - } - public Boolean getActive() { return this.active; } @@ -190,8 +172,7 @@ public final class LmsSetup implements GrantEntity, Activatable { + ", lmsType=" + this.lmsType + ", lmsAuthName=" + this.lmsAuthName + ", lmsAuthSecret=" + this.lmsAuthSecret + ", lmsApiUrl=" + this.lmsApiUrl - + ", lmsRestApiToken=" + this.lmsRestApiToken + ", sebAuthName=" + this.sebAuthName + ", sebAuthSecret=" - + this.sebAuthSecret + ", active=" + this.active + "]"; + + ", lmsRestApiToken=" + this.lmsRestApiToken + ", active=" + this.active + "]"; } public static EntityName toName(final LmsSetup lmsSetup) { @@ -202,7 +183,7 @@ public final class LmsSetup implements GrantEntity, Activatable { } public static LmsSetup createNew(final Long institutionId) { - return new LmsSetup(null, institutionId, null, null, null, null, null, null, null, null, false); + return new LmsSetup(null, institutionId, null, null, null, null, null, null, false); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/LmsSetupForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/LmsSetupForm.java index 36f7418b..c27ecdfc 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/LmsSetupForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/LmsSetupForm.java @@ -149,16 +149,6 @@ public class LmsSetupForm implements TemplateComposer { (lmsType != null) ? lmsType.name() : null, this.resourceService::lmsTypeResources) .readonlyIf(isNotNew)) - .addField(FormBuilder.text( - Domain.LMS_SETUP.ATTR_SEB_CLIENTNAME, - "sebserver.lmssetup.form.clientname.seb", - lmsSetup.getSebAuthName()) - .readonlyIf(isNotNew)) - .addField(FormBuilder.text( - Domain.LMS_SETUP.ATTR_SEB_CLIENTSECRET, - "sebserver.lmssetup.form.secret.seb") - .asPasswordField() - .withCondition(isNew)) .addField(FormBuilder.text( Domain.LMS_SETUP.ATTR_LMS_URL, diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java index a5498a51..397e535a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java @@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class AdditionalAttributesDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") public static final AdditionalAttributes additionalAttributes = new AdditionalAttributes(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source field: additional_attributes.id") public static final SqlColumn id = additionalAttributes.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source field: additional_attributes.entity_type") public static final SqlColumn entityType = additionalAttributes.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source field: additional_attributes.entity_id") public static final SqlColumn entityId = additionalAttributes.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source field: additional_attributes.name") public static final SqlColumn name = additionalAttributes.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source field: additional_attributes.value") public static final SqlColumn value = additionalAttributes.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") public static final class AdditionalAttributes extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java index fab4724a..df084b51 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface AdditionalAttributesMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01: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="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01: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 AdditionalAttributesMapper { }) AdditionalAttributes selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01: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 AdditionalAttributesMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(additionalAttributes); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributes); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributes) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface AdditionalAttributesMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default int insert(AdditionalAttributes record) { return insert(SqlBuilder.insert(record) .into(additionalAttributes) @@ -102,7 +102,7 @@ public interface AdditionalAttributesMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default int insertSelective(AdditionalAttributes record) { return insert(SqlBuilder.insert(record) .into(additionalAttributes) @@ -114,19 +114,19 @@ public interface AdditionalAttributesMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, entityType, entityId, name, value) .from(additionalAttributes); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, entityType, entityId, name, value) .from(additionalAttributes); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default AdditionalAttributes selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, entityType, entityId, name, value) .from(additionalAttributes) @@ -135,7 +135,7 @@ public interface AdditionalAttributesMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default UpdateDSL> updateByExample(AdditionalAttributes record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributes) .set(entityType).equalTo(record::getEntityType) @@ -144,7 +144,7 @@ public interface AdditionalAttributesMapper { .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default UpdateDSL> updateByExampleSelective(AdditionalAttributes record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributes) .set(entityType).equalToWhenPresent(record::getEntityType) @@ -153,7 +153,7 @@ public interface AdditionalAttributesMapper { .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default int updateByPrimaryKey(AdditionalAttributes record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributes) .set(entityType).equalTo(record::getEntityType) @@ -165,7 +165,7 @@ public interface AdditionalAttributesMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") default int updateByPrimaryKeySelective(AdditionalAttributes record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributes) .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 10c43753..d02c0ee1 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,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientConnectionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source Table: client_connection") public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.id") public static final SqlColumn id = clientConnectionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source field: client_connection.exam_id") public static final SqlColumn examId = clientConnectionRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source field: client_connection.status") public static final SqlColumn status = clientConnectionRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source field: client_connection.connection_token") public static final SqlColumn connectionToken = clientConnectionRecord.connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source field: client_connection.user_name") public static final SqlColumn userName = clientConnectionRecord.userName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source field: client_connection.vdi") public static final SqlColumn vdi = clientConnectionRecord.vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source field: client_connection.client_address") public static final SqlColumn clientAddress = clientConnectionRecord.clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source field: client_connection.virtual_client_address") public static final SqlColumn virtualClientAddress = clientConnectionRecord.virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01: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 e6682be4..ff1d9add 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="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01: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="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ClientConnectionRecordMapper { }) ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ClientConnectionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01: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="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") default int insert(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -111,7 +111,7 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") default int insertSelective(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -126,19 +126,19 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") default ClientConnectionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) .from(clientConnectionRecord) @@ -147,7 +147,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") default UpdateDSL> updateByExample(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalTo(record::getExamId) @@ -159,7 +159,7 @@ public interface ClientConnectionRecordMapper { .set(virtualClientAddress).equalTo(record::getVirtualClientAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.794+01:00", comments="Source Table: client_connection") default UpdateDSL> updateByExampleSelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -171,7 +171,7 @@ public interface ClientConnectionRecordMapper { .set(virtualClientAddress).equalToWhenPresent(record::getVirtualClientAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.794+01:00", comments="Source Table: client_connection") default int updateByPrimaryKey(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalTo(record::getExamId) @@ -186,7 +186,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.794+01:00", comments="Source Table: client_connection") default int updateByPrimaryKeySelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalToWhenPresent(record::getExamId) 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 132fd590..2cf366c6 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="2019-02-25T10:55:53.690+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.797+01:00", comments="Source Table: client_event") public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.798+01:00", comments="Source field: client_event.id") public static final SqlColumn id = clientEventRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.798+01:00", comments="Source field: client_event.connection_id") public static final SqlColumn connectionId = clientEventRecord.connectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.798+01:00", comments="Source field: client_event.user_identifier") public static final SqlColumn userIdentifier = clientEventRecord.userIdentifier; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.798+01:00", comments="Source field: client_event.type") public static final SqlColumn type = clientEventRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.798+01:00", comments="Source field: client_event.timestamp") public static final SqlColumn timestamp = clientEventRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01:00", comments="Source field: client_event.numeric_value") public static final SqlColumn numericValue = clientEventRecord.numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01:00", comments="Source field: client_event.text") public static final SqlColumn text = clientEventRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.798+01: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 f6ce7382..56c4567c 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 @@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientEventRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01:00", comments="Source Table: client_event") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01:00", comments="Source Table: client_event") @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="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ClientEventRecordMapper { }) ClientEventRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -72,22 +72,22 @@ public interface ClientEventRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01:00", comments="Source Table: client_event") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01: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="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01:00", comments="Source Table: client_event") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.800+01:00", comments="Source Table: client_event") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord) .where(id, isEqualTo(id_)) @@ -95,7 +95,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.800+01:00", comments="Source Table: client_event") default int insert(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -109,7 +109,7 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.800+01: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="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.800+01:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.800+01:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.800+01:00", comments="Source Table: client_event") default ClientEventRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, userIdentifier, type, timestamp, numericValue, text) .from(clientEventRecord) @@ -144,7 +144,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.800+01:00", comments="Source Table: client_event") default UpdateDSL> updateByExample(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalTo(record::getConnectionId) @@ -155,7 +155,7 @@ public interface ClientEventRecordMapper { .set(text).equalTo(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.800+01:00", comments="Source Table: client_event") default UpdateDSL> updateByExampleSelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalToWhenPresent(record::getConnectionId) @@ -166,7 +166,7 @@ public interface ClientEventRecordMapper { .set(text).equalToWhenPresent(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.803+01:00", comments="Source Table: client_event") default int updateByPrimaryKey(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalTo(record::getConnectionId) @@ -180,7 +180,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.803+01:00", comments="Source Table: client_event") default int updateByPrimaryKeySelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalToWhenPresent(record::getConnectionId) 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 77721561..322d68a8 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="2019-02-25T10:55:53.509+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.448+01:00", comments="Source Table: configuration_attribute") public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.512+01:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.452+01:00", comments="Source field: configuration_attribute.id") public static final SqlColumn id = configurationAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.513+01:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.453+01:00", comments="Source field: configuration_attribute.name") public static final SqlColumn name = configurationAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.513+01:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.453+01:00", comments="Source field: configuration_attribute.type") public static final SqlColumn type = configurationAttributeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.513+01:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.454+01:00", comments="Source field: configuration_attribute.parent_id") public static final SqlColumn parentId = configurationAttributeRecord.parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.513+01:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.454+01:00", comments="Source field: configuration_attribute.resources") public static final SqlColumn resources = configurationAttributeRecord.resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.513+01:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.455+01:00", comments="Source field: configuration_attribute.validator") public static final SqlColumn validator = configurationAttributeRecord.validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.514+01:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.456+01:00", comments="Source field: configuration_attribute.dependencies") public static final SqlColumn dependencies = configurationAttributeRecord.dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.514+01:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.456+01:00", comments="Source field: configuration_attribute.default_value") public static final SqlColumn defaultValue = configurationAttributeRecord.defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.511+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.451+01: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 0c7f1979..3ae0c94c 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="2019-02-25T10:55:53.515+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.458+01:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.516+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.460+01:00", comments="Source Table: configuration_attribute") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.517+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.461+01: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="2019-02-25T10:55:53.518+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.474+01: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="2019-02-25T10:55:53.519+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.481+01: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="2019-02-25T10:55:53.520+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.484+01:00", comments="Source Table: configuration_attribute") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.521+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.486+01: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="2019-02-25T10:55:53.521+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.487+01:00", comments="Source Table: configuration_attribute") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.522+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.488+01: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="2019-02-25T10:55:53.522+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.490+01: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="2019-02-25T10:55:53.523+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.493+01: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="2019-02-25T10:55:53.524+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.496+01: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="2019-02-25T10:55:53.525+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.499+01: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="2019-02-25T10:55:53.525+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.500+01: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="2019-02-25T10:55:53.526+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.501+01: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="2019-02-25T10:55:53.526+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.502+01: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="2019-02-25T10:55:53.527+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.504+01: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="2019-02-25T10:55:53.528+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.505+01: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 24c65cda..223b918c 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="2019-02-25T10:55:53.662+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source Table: configuration_node") public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.774+01:00", comments="Source field: configuration_node.id") public static final SqlColumn id = configurationNodeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.774+01:00", comments="Source field: configuration_node.institution_id") public static final SqlColumn institutionId = configurationNodeRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.774+01:00", comments="Source field: configuration_node.owner") public static final SqlColumn owner = configurationNodeRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.774+01:00", comments="Source field: configuration_node.name") public static final SqlColumn name = configurationNodeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.774+01:00", comments="Source field: configuration_node.description") public static final SqlColumn description = configurationNodeRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.775+01:00", comments="Source field: configuration_node.type") public static final SqlColumn type = configurationNodeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source field: configuration_node.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.775+01:00", comments="Source field: configuration_node.template") public static final SqlColumn template = configurationNodeRecord.template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source field: configuration_node.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.775+01:00", comments="Source field: configuration_node.active") public static final SqlColumn active = configurationNodeRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01: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 83ca35b0..8a3428ee 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="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.775+01:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.775+01:00", comments="Source Table: configuration_node") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.775+01: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="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.775+01: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="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.776+01: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="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.776+01: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="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.776+01: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="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.776+01: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="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.776+01: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="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, name, description, type, template, active) .from(configurationNodeRecord) @@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.777+01: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(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.777+01: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(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.665+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.777+01: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="2019-02-25T10:55:53.665+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.777+01: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 3d9aba22..d6c3e593 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,25 +7,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source Table: configuration") public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.767+01:00", comments="Source field: configuration.id") public static final SqlColumn id = configurationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.767+01:00", comments="Source field: configuration.configuration_node_id") public static final SqlColumn configurationNodeId = configurationRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.767+01:00", comments="Source field: configuration.version") public static final SqlColumn version = configurationRecord.version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.768+01:00", comments="Source field: configuration.version_date") public static final SqlColumn versionDate = configurationRecord.versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.768+01:00", comments="Source field: configuration.followup") public static final SqlColumn followup = configurationRecord.followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.767+01: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 f76c89c3..3a707d01 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="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.768+01:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.768+01:00", comments="Source Table: configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.768+01: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="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.768+01:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface ConfigurationRecordMapper { }) ConfigurationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.768+01:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ConfigurationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01:00", comments="Source Table: configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01: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="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01:00", comments="Source Table: configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01:00", comments="Source Table: configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01:00", comments="Source Table: configuration") default int insert(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -104,7 +104,7 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01:00", comments="Source Table: configuration") default int insertSelective(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -116,19 +116,19 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01:00", comments="Source Table: configuration") default ConfigurationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, configurationNodeId, version, versionDate, followup) .from(configurationRecord) @@ -137,7 +137,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01:00", comments="Source Table: configuration") default UpdateDSL> updateByExample(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(configurationNodeId).equalTo(record::getConfigurationNodeId) @@ -146,7 +146,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalTo(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.770+01:00", comments="Source Table: configuration") default UpdateDSL> updateByExampleSelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId) @@ -155,7 +155,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalToWhenPresent(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.770+01:00", comments="Source Table: configuration") default int updateByPrimaryKey(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(configurationNodeId).equalTo(record::getConfigurationNodeId) @@ -167,7 +167,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.770+01:00", comments="Source Table: configuration") default int updateByPrimaryKeySelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId) 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 0a87b778..1821aadc 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="2019-02-25T10:55:53.648+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.747+01:00", comments="Source Table: configuration_value") public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.747+01:00", comments="Source field: configuration_value.id") public static final SqlColumn id = configurationValueRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.747+01:00", comments="Source field: configuration_value.configuration_id") public static final SqlColumn configurationId = configurationValueRecord.configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.747+01:00", comments="Source field: configuration_value.configuration_attribute_id") public static final SqlColumn configurationAttributeId = configurationValueRecord.configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.747+01:00", comments="Source field: configuration_value.list_index") public static final SqlColumn listIndex = configurationValueRecord.listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.748+01:00", comments="Source field: configuration_value.value") public static final SqlColumn value = configurationValueRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source field: configuration_value.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.748+01:00", comments="Source field: configuration_value.text") public static final SqlColumn text = configurationValueRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.747+01: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 31128a5f..310dc193 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 @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationValueRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.748+01:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.748+01:00", comments="Source Table: configuration_value") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.748+01:00", comments="Source Table: configuration_value") @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="2019-02-25T10:55:53.649+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.748+01:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ConfigurationValueRecordMapper { }) ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ConfigurationValueRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.749+01: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="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") default int insert(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -105,7 +105,7 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.749+01: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="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") default ConfigurationValueRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, configurationId, configurationAttributeId, listIndex, value, text) .from(configurationValueRecord) @@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExample(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(configurationId).equalTo(record::getConfigurationId) @@ -149,7 +149,7 @@ public interface ConfigurationValueRecordMapper { .set(text).equalTo(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExampleSelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(configurationId).equalToWhenPresent(record::getConfigurationId) @@ -159,7 +159,7 @@ public interface ConfigurationValueRecordMapper { .set(text).equalToWhenPresent(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") default int updateByPrimaryKey(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(configurationId).equalTo(record::getConfigurationId) @@ -172,7 +172,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") default int updateByPrimaryKeySelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(configurationId).equalToWhenPresent(record::getConfigurationId) 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 10bcd0f6..141308b7 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,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamConfigurationMapRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.667+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.779+01:00", comments="Source Table: exam_configuration_map") public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.780+01:00", comments="Source field: exam_configuration_map.id") public static final SqlColumn id = examConfigurationMapRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.780+01:00", comments="Source field: exam_configuration_map.exam_id") public static final SqlColumn examId = examConfigurationMapRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.781+01: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="2019-02-25T10:55:53.678+01:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.781+01:00", comments="Source field: exam_configuration_map.user_names") public static final SqlColumn userNames = examConfigurationMapRecord.userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.780+01: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 4574228e..7f227192 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="2019-02-25T10:55:53.678+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.781+01: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="2019-02-25T10:55:53.678+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.781+01: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="2019-02-25T10:55:53.678+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.781+01: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="2019-02-25T10:55:53.678+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.781+01: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), @@ -55,7 +55,7 @@ public interface ExamConfigurationMapRecordMapper { }) ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01: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), @@ -65,22 +65,22 @@ public interface ExamConfigurationMapRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01: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="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01: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="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord) .where(id, isEqualTo(id_)) @@ -88,7 +88,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") default int insert(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -99,7 +99,7 @@ public interface ExamConfigurationMapRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") default int insertSelective(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -110,19 +110,19 @@ public interface ExamConfigurationMapRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, configurationNodeId, userNames) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, configurationNodeId, userNames) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, configurationNodeId, userNames) .from(examConfigurationMapRecord) @@ -131,7 +131,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExample(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(examId).equalTo(record::getExamId) @@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper { .set(userNames).equalTo(record::getUserNames); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.680+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExampleSelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -147,7 +147,7 @@ public interface ExamConfigurationMapRecordMapper { .set(userNames).equalToWhenPresent(record::getUserNames); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.680+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKey(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(examId).equalTo(record::getExamId) @@ -158,7 +158,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.680+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.783+01:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(examId).equalToWhenPresent(record::getExamId) 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 4ead5946..56d76dde 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,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source Table: exam") public static final ExamRecord examRecord = new ExamRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.id") public static final SqlColumn id = examRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.institution_id") public static final SqlColumn institutionId = examRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.lms_setup_id") public static final SqlColumn lmsSetupId = examRecord.lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.external_id") public static final SqlColumn externalId = examRecord.externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.owner") public static final SqlColumn owner = examRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.supporter") public static final SqlColumn supporter = examRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.type") public static final SqlColumn type = examRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.status") public static final SqlColumn status = examRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.quit_password") public static final SqlColumn quitPassword = examRecord.quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source field: exam.active") public static final SqlColumn active = examRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01: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 60559708..04247770 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="2019-02-25T10:55:53.683+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source Table: exam") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01: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="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface ExamRecordMapper { }) ExamRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -77,22 +77,22 @@ public interface ExamRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source Table: exam") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01: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="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source Table: exam") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source Table: exam") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source Table: exam") default int insert(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -117,7 +117,7 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.789+01:00", comments="Source Table: exam") default int insertSelective(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -134,19 +134,19 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.789+01:00", comments="Source Table: exam") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.789+01:00", comments="Source Table: exam") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.789+01:00", comments="Source Table: exam") default ExamRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active) .from(examRecord) @@ -155,7 +155,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.789+01:00", comments="Source Table: exam") default UpdateDSL> updateByExample(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -169,7 +169,7 @@ public interface ExamRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.789+01:00", comments="Source Table: exam") default UpdateDSL> updateByExampleSelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -183,7 +183,7 @@ public interface ExamRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.789+01:00", comments="Source Table: exam") default int updateByPrimaryKey(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -200,7 +200,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.789+01: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 bb0d7c39..e698be82 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="2019-02-25T10:55:53.692+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.808+01:00", comments="Source Table: indicator") public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source field: indicator.id") public static final SqlColumn id = indicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source field: indicator.exam_id") public static final SqlColumn examId = indicatorRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source field: indicator.type") public static final SqlColumn type = indicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.693+01:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source field: indicator.name") public static final SqlColumn name = indicatorRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.693+01:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source field: indicator.color") public static final SqlColumn color = indicatorRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01: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 c5b9277b..1102bfec 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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01:00", comments="Source Table: indicator") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01:00", comments="Source Table: indicator") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01:00", comments="Source Table: indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.811+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.811+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.811+01: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="2019-02-25T10:55:53.693+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.811+01: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 17a3531b..455b4428 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,25 +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="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source Table: institution") public static final InstitutionRecord institutionRecord = new InstitutionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source field: institution.id") public static final SqlColumn id = institutionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source field: institution.name") public static final SqlColumn name = institutionRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source field: institution.url_suffix") public static final SqlColumn urlSuffix = institutionRecord.urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source field: institution.theme_name") + public static final SqlColumn themeName = institutionRecord.themeName; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source field: institution.active") public static final SqlColumn active = institutionRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source field: institution.logo_image") public static final SqlColumn logoImage = institutionRecord.logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source Table: institution") public static final class InstitutionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); @@ -32,6 +35,8 @@ public final class InstitutionRecordDynamicSqlSupport { public final SqlColumn urlSuffix = column("url_suffix", JDBCType.VARCHAR); + public final SqlColumn themeName = column("theme_name", JDBCType.VARCHAR); + public final SqlColumn active = column("active", JDBCType.INTEGER); public final SqlColumn logoImage = column("logo_image", JDBCType.CLOB); 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 3c57cba6..5d7119f6 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,57 +32,59 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface InstitutionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01: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="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="url_suffix", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="theme_name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER), @Arg(column="logo_image", javaType=String.class, jdbcType=JdbcType.CLOB) }) InstitutionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="url_suffix", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="theme_name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER), @Arg(column="logo_image", javaType=String.class, jdbcType=JdbcType.CLOB) }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01: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="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) .where(id, isEqualTo(id_)) @@ -90,74 +92,79 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") default int insert(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) .map(name).toProperty("name") .map(urlSuffix).toProperty("urlSuffix") + .map(themeName).toProperty("themeName") .map(active).toProperty("active") .map(logoImage).toProperty("logoImage") .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") default int insertSelective(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) .map(name).toPropertyWhenPresent("name", record::getName) .map(urlSuffix).toPropertyWhenPresent("urlSuffix", record::getUrlSuffix) + .map(themeName).toPropertyWhenPresent("themeName", record::getThemeName) .map(active).toPropertyWhenPresent("active", record::getActive) .map(logoImage).toPropertyWhenPresent("logoImage", record::getLogoImage) .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") default QueryExpressionDSL>> selectByExample() { - return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage) + return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") default QueryExpressionDSL>> selectDistinctByExample() { - return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage) + return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") default InstitutionRecord selectByPrimaryKey(Long id_) { - return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, active, logoImage) + return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") default UpdateDSL> updateByExample(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) .set(urlSuffix).equalTo(record::getUrlSuffix) + .set(themeName).equalTo(record::getThemeName) .set(active).equalTo(record::getActive) .set(logoImage).equalTo(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") default UpdateDSL> updateByExampleSelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) .set(urlSuffix).equalToWhenPresent(record::getUrlSuffix) + .set(themeName).equalToWhenPresent(record::getThemeName) .set(active).equalToWhenPresent(record::getActive) .set(logoImage).equalToWhenPresent(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") default int updateByPrimaryKey(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) .set(urlSuffix).equalTo(record::getUrlSuffix) + .set(themeName).equalTo(record::getThemeName) .set(active).equalTo(record::getActive) .set(logoImage).equalTo(record::getLogoImage) .where(id, isEqualTo(record::getId)) @@ -165,11 +172,12 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") default int updateByPrimaryKeySelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) .set(urlSuffix).equalToWhenPresent(record::getUrlSuffix) + .set(themeName).equalToWhenPresent(record::getThemeName) .set(active).equalToWhenPresent(record::getActive) .set(logoImage).equalToWhenPresent(record::getLogoImage) .where(id, isEqualTo(record::getId)) 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 7b72b48d..1dcb4637 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,43 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class LmsSetupRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.830+01:00", comments="Source Table: lms_setup") public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.830+01:00", comments="Source field: lms_setup.id") public static final SqlColumn id = lmsSetupRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.830+01:00", comments="Source field: lms_setup.institution_id") public static final SqlColumn institutionId = lmsSetupRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.830+01:00", comments="Source field: lms_setup.name") public static final SqlColumn name = lmsSetupRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.lms_type") public static final SqlColumn lmsType = lmsSetupRecord.lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.lms_url") public static final SqlColumn lmsUrl = lmsSetupRecord.lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.lms_clientname") public static final SqlColumn lmsClientname = lmsSetupRecord.lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.lms_clientsecret") public static final SqlColumn lmsClientsecret = lmsSetupRecord.lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.831+01: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="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.seb_clientname") - public static final SqlColumn sebClientname = lmsSetupRecord.sebClientname; - - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.seb_clientsecret") - public static final SqlColumn sebClientsecret = lmsSetupRecord.sebClientsecret; - - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.active") public static final SqlColumn active = lmsSetupRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.830+01:00", comments="Source Table: lms_setup") public static final class LmsSetupRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); @@ -60,10 +54,6 @@ public final class LmsSetupRecordDynamicSqlSupport { public final SqlColumn lmsRestApiToken = column("lms_rest_api_token", JDBCType.VARCHAR); - public final SqlColumn sebClientname = column("seb_clientname", JDBCType.VARCHAR); - - public final SqlColumn sebClientsecret = column("seb_clientsecret", JDBCType.VARCHAR); - public final SqlColumn active = column("active", JDBCType.INTEGER); public LmsSetupRecord() { 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 d2503e1b..c95f27d4 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="2019-02-25T10:55:53.700+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.831+01:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.831+01:00", comments="Source Table: lms_setup") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.831+01: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="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,13 +56,11 @@ public interface LmsSetupRecordMapper { @Arg(column="lms_clientname", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="lms_clientsecret", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="lms_rest_api_token", javaType=String.class, jdbcType=JdbcType.VARCHAR), - @Arg(column="seb_clientname", javaType=String.class, jdbcType=JdbcType.VARCHAR), - @Arg(column="seb_clientsecret", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER) }) LmsSetupRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,28 +71,26 @@ public interface LmsSetupRecordMapper { @Arg(column="lms_clientname", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="lms_clientsecret", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="lms_rest_api_token", javaType=String.class, jdbcType=JdbcType.VARCHAR), - @Arg(column="seb_clientname", javaType=String.class, jdbcType=JdbcType.VARCHAR), - @Arg(column="seb_clientsecret", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER) }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01: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="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord) .where(id, isEqualTo(id_)) @@ -102,7 +98,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") default int insert(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -113,14 +109,12 @@ public interface LmsSetupRecordMapper { .map(lmsClientname).toProperty("lmsClientname") .map(lmsClientsecret).toProperty("lmsClientsecret") .map(lmsRestApiToken).toProperty("lmsRestApiToken") - .map(sebClientname).toProperty("sebClientname") - .map(sebClientsecret).toProperty("sebClientsecret") .map(active).toProperty("active") .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") default int insertSelective(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -131,35 +125,33 @@ public interface LmsSetupRecordMapper { .map(lmsClientname).toPropertyWhenPresent("lmsClientname", record::getLmsClientname) .map(lmsClientsecret).toPropertyWhenPresent("lmsClientsecret", record::getLmsClientsecret) .map(lmsRestApiToken).toPropertyWhenPresent("lmsRestApiToken", record::getLmsRestApiToken) - .map(sebClientname).toPropertyWhenPresent("sebClientname", record::getSebClientname) - .map(sebClientsecret).toPropertyWhenPresent("sebClientsecret", record::getSebClientsecret) .map(active).toPropertyWhenPresent("active", record::getActive) .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") default QueryExpressionDSL>> selectByExample() { - return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active) + return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, active) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") default QueryExpressionDSL>> selectDistinctByExample() { - return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active) + return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, active) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") default LmsSetupRecord selectByPrimaryKey(Long id_) { - return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active) + return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, active) .from(lmsSetupRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExample(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -169,12 +161,10 @@ public interface LmsSetupRecordMapper { .set(lmsClientname).equalTo(record::getLmsClientname) .set(lmsClientsecret).equalTo(record::getLmsClientsecret) .set(lmsRestApiToken).equalTo(record::getLmsRestApiToken) - .set(sebClientname).equalTo(record::getSebClientname) - .set(sebClientsecret).equalTo(record::getSebClientsecret) .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.833+01:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExampleSelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -184,12 +174,10 @@ public interface LmsSetupRecordMapper { .set(lmsClientname).equalToWhenPresent(record::getLmsClientname) .set(lmsClientsecret).equalToWhenPresent(record::getLmsClientsecret) .set(lmsRestApiToken).equalToWhenPresent(record::getLmsRestApiToken) - .set(sebClientname).equalToWhenPresent(record::getSebClientname) - .set(sebClientsecret).equalToWhenPresent(record::getSebClientsecret) .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.833+01:00", comments="Source Table: lms_setup") default int updateByPrimaryKey(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -199,15 +187,13 @@ public interface LmsSetupRecordMapper { .set(lmsClientname).equalTo(record::getLmsClientname) .set(lmsClientsecret).equalTo(record::getLmsClientsecret) .set(lmsRestApiToken).equalTo(record::getLmsRestApiToken) - .set(sebClientname).equalTo(record::getSebClientname) - .set(sebClientsecret).equalTo(record::getSebClientsecret) .set(active).equalTo(record::getActive) .where(id, isEqualTo(record::getId)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.833+01:00", comments="Source Table: lms_setup") default int updateByPrimaryKeySelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -217,8 +203,6 @@ public interface LmsSetupRecordMapper { .set(lmsClientname).equalToWhenPresent(record::getLmsClientname) .set(lmsClientsecret).equalToWhenPresent(record::getLmsClientsecret) .set(lmsRestApiToken).equalToWhenPresent(record::getLmsRestApiToken) - .set(sebClientname).equalToWhenPresent(record::getSebClientname) - .set(sebClientsecret).equalToWhenPresent(record::getSebClientsecret) .set(active).equalToWhenPresent(record::getActive) .where(id, isEqualTo(record::getId)) .build() 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 0b753460..e1e150da 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,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class OrientationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.754+01:00", comments="Source Table: orientation") public static final OrientationRecord orientationRecord = new OrientationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.754+01:00", comments="Source field: orientation.id") public static final SqlColumn id = orientationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.754+01:00", comments="Source field: orientation.config_attribute_id") public static final SqlColumn configAttributeId = orientationRecord.configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source field: orientation.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.754+01:00", comments="Source field: orientation.template") public static final SqlColumn template = orientationRecord.template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source field: orientation.view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.755+01:00", comments="Source field: orientation.view") public static final SqlColumn view = orientationRecord.view; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source field: orientation.group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.755+01:00", comments="Source field: orientation.group") public static final SqlColumn group = orientationRecord.group; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.654+01:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.755+01:00", comments="Source field: orientation.x_position") public static final SqlColumn xPosition = orientationRecord.xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.654+01:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.755+01:00", comments="Source field: orientation.y_position") public static final SqlColumn yPosition = orientationRecord.yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.654+01:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.755+01:00", comments="Source field: orientation.width") public static final SqlColumn width = orientationRecord.width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.654+01:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.756+01:00", comments="Source field: orientation.height") public static final SqlColumn height = orientationRecord.height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.754+01: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 2ad755d1..25fcaac9 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="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.756+01:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.756+01:00", comments="Source Table: orientation") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.756+01: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="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.756+01:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -60,7 +60,7 @@ public interface OrientationRecordMapper { }) OrientationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.756+01:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface OrientationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.756+01:00", comments="Source Table: orientation") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.756+01: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="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.757+01:00", comments="Source Table: orientation") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.757+01:00", comments="Source Table: orientation") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.757+01:00", comments="Source Table: orientation") default int insert(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -114,7 +114,7 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.757+01:00", comments="Source Table: orientation") default int insertSelective(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -130,19 +130,19 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.762+01:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.763+01:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.763+01:00", comments="Source Table: orientation") default OrientationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) .from(orientationRecord) @@ -151,7 +151,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.763+01:00", comments="Source Table: orientation") default UpdateDSL> updateByExample(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -164,7 +164,7 @@ public interface OrientationRecordMapper { .set(height).equalTo(record::getHeight); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.657+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.763+01:00", comments="Source Table: orientation") default UpdateDSL> updateByExampleSelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) @@ -177,7 +177,7 @@ public interface OrientationRecordMapper { .set(height).equalToWhenPresent(record::getHeight); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.657+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.764+01:00", comments="Source Table: orientation") default int updateByPrimaryKey(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -193,7 +193,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.657+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.764+01: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 aa10de83..001a06a8 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="2019-02-25T10:55:53.711+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source Table: user_role") public static final RoleRecord roleRecord = new RoleRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.id") public static final SqlColumn id = roleRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.user_id") public static final SqlColumn userId = roleRecord.userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.role_name") public static final SqlColumn roleName = roleRecord.roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01: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 6424996d..fa172142 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="2019-02-25T10:55:53.711+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source Table: user_role") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01: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="2019-02-25T10:55:53.711+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.711+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.711+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01:00", comments="Source Table: user_role") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01:00", comments="Source Table: user_role") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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="2019-02-25T10:55:53.712+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.841+01: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/SebClientCredentialsRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientCredentialsRecordDynamicSqlSupport.java new file mode 100644 index 00000000..b5672a16 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientCredentialsRecordDynamicSqlSupport.java @@ -0,0 +1,54 @@ +package ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper; + +import java.sql.JDBCType; +import java.util.Date; +import javax.annotation.Generated; +import org.mybatis.dynamic.sql.SqlColumn; +import org.mybatis.dynamic.sql.SqlTable; + +public final class SebClientCredentialsRecordDynamicSqlSupport { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.823+01:00", comments="Source Table: seb_client_credentials") + public static final SebClientCredentialsRecord sebClientCredentialsRecord = new SebClientCredentialsRecord(); + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.823+01:00", comments="Source field: seb_client_credentials.id") + public static final SqlColumn id = sebClientCredentialsRecord.id; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.823+01:00", comments="Source field: seb_client_credentials.institution_id") + public static final SqlColumn institutionId = sebClientCredentialsRecord.institutionId; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source field: seb_client_credentials.name") + public static final SqlColumn name = sebClientCredentialsRecord.name; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source field: seb_client_credentials.date") + public static final SqlColumn date = sebClientCredentialsRecord.date; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source field: seb_client_credentials.client_name") + public static final SqlColumn clientName = sebClientCredentialsRecord.clientName; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source field: seb_client_credentials.client_secret") + public static final SqlColumn clientSecret = sebClientCredentialsRecord.clientSecret; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source field: seb_client_credentials.active") + public static final SqlColumn active = sebClientCredentialsRecord.active; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.823+01:00", comments="Source Table: seb_client_credentials") + public static final class SebClientCredentialsRecord extends SqlTable { + public final SqlColumn id = column("id", JDBCType.BIGINT); + + public final SqlColumn institutionId = column("institution_id", JDBCType.BIGINT); + + public final SqlColumn name = column("name", JDBCType.VARCHAR); + + public final SqlColumn date = column("date", JDBCType.TIMESTAMP); + + public final SqlColumn clientName = column("client_name", JDBCType.VARCHAR); + + public final SqlColumn clientSecret = column("client_secret", JDBCType.VARCHAR); + + public final SqlColumn active = column("active", JDBCType.INTEGER); + + public SebClientCredentialsRecord() { + super("seb_client_credentials"); + } + } +} \ No newline at end of file diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientCredentialsRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientCredentialsRecordMapper.java new file mode 100644 index 00000000..da57b493 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientCredentialsRecordMapper.java @@ -0,0 +1,206 @@ +package ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper; + +import static ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.SebClientCredentialsRecordDynamicSqlSupport.*; +import static org.mybatis.dynamic.sql.SqlBuilder.*; + +import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.SebClientCredentialsRecord; +import java.util.Date; +import java.util.List; +import javax.annotation.Generated; +import org.apache.ibatis.annotations.Arg; +import org.apache.ibatis.annotations.ConstructorArgs; +import org.apache.ibatis.annotations.DeleteProvider; +import org.apache.ibatis.annotations.InsertProvider; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.SelectKey; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.UpdateProvider; +import org.apache.ibatis.type.JdbcType; +import org.mybatis.dynamic.sql.SqlBuilder; +import org.mybatis.dynamic.sql.delete.DeleteDSL; +import org.mybatis.dynamic.sql.delete.MyBatis3DeleteModelAdapter; +import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider; +import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider; +import org.mybatis.dynamic.sql.render.RenderingStrategy; +import org.mybatis.dynamic.sql.select.MyBatis3SelectModelAdapter; +import org.mybatis.dynamic.sql.select.QueryExpressionDSL; +import org.mybatis.dynamic.sql.select.SelectDSL; +import org.mybatis.dynamic.sql.select.render.SelectStatementProvider; +import org.mybatis.dynamic.sql.update.MyBatis3UpdateModelAdapter; +import org.mybatis.dynamic.sql.update.UpdateDSL; +import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider; +import org.mybatis.dynamic.sql.util.SqlProviderAdapter; + +@Mapper +public interface SebClientCredentialsRecordMapper { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source Table: seb_client_credentials") + @SelectProvider(type=SqlProviderAdapter.class, method="select") + long count(SelectStatementProvider selectStatement); + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source Table: seb_client_credentials") + @DeleteProvider(type=SqlProviderAdapter.class, method="delete") + int delete(DeleteStatementProvider deleteStatement); + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source Table: seb_client_credentials") + @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="2019-03-07T15:53:05.824+01:00", comments="Source Table: seb_client_credentials") + @SelectProvider(type=SqlProviderAdapter.class, method="select") + @ConstructorArgs({ + @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), + @Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), + @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="date", javaType=Date.class, jdbcType=JdbcType.TIMESTAMP), + @Arg(column="client_name", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="client_secret", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER) + }) + SebClientCredentialsRecord selectOne(SelectStatementProvider selectStatement); + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source Table: seb_client_credentials") + @SelectProvider(type=SqlProviderAdapter.class, method="select") + @ConstructorArgs({ + @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), + @Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), + @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="date", javaType=Date.class, jdbcType=JdbcType.TIMESTAMP), + @Arg(column="client_name", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="client_secret", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER) + }) + List selectMany(SelectStatementProvider selectStatement); + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + @UpdateProvider(type=SqlProviderAdapter.class, method="update") + int update(UpdateStatementProvider updateStatement); + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default QueryExpressionDSL> countByExample() { + return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) + .from(sebClientCredentialsRecord); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default DeleteDSL> deleteByExample() { + return DeleteDSL.deleteFromWithMapper(this::delete, sebClientCredentialsRecord); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default int deleteByPrimaryKey(Long id_) { + return DeleteDSL.deleteFromWithMapper(this::delete, sebClientCredentialsRecord) + .where(id, isEqualTo(id_)) + .build() + .execute(); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default int insert(SebClientCredentialsRecord record) { + return insert(SqlBuilder.insert(record) + .into(sebClientCredentialsRecord) + .map(institutionId).toProperty("institutionId") + .map(name).toProperty("name") + .map(date).toProperty("date") + .map(clientName).toProperty("clientName") + .map(clientSecret).toProperty("clientSecret") + .map(active).toProperty("active") + .build() + .render(RenderingStrategy.MYBATIS3)); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default int insertSelective(SebClientCredentialsRecord record) { + return insert(SqlBuilder.insert(record) + .into(sebClientCredentialsRecord) + .map(institutionId).toPropertyWhenPresent("institutionId", record::getInstitutionId) + .map(name).toPropertyWhenPresent("name", record::getName) + .map(date).toPropertyWhenPresent("date", record::getDate) + .map(clientName).toPropertyWhenPresent("clientName", record::getClientName) + .map(clientSecret).toPropertyWhenPresent("clientSecret", record::getClientSecret) + .map(active).toPropertyWhenPresent("active", record::getActive) + .build() + .render(RenderingStrategy.MYBATIS3)); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default QueryExpressionDSL>> selectByExample() { + return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, active) + .from(sebClientCredentialsRecord); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default QueryExpressionDSL>> selectDistinctByExample() { + return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, active) + .from(sebClientCredentialsRecord); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default SebClientCredentialsRecord selectByPrimaryKey(Long id_) { + return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, active) + .from(sebClientCredentialsRecord) + .where(id, isEqualTo(id_)) + .build() + .execute(); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default UpdateDSL> updateByExample(SebClientCredentialsRecord record) { + return UpdateDSL.updateWithMapper(this::update, sebClientCredentialsRecord) + .set(institutionId).equalTo(record::getInstitutionId) + .set(name).equalTo(record::getName) + .set(date).equalTo(record::getDate) + .set(clientName).equalTo(record::getClientName) + .set(clientSecret).equalTo(record::getClientSecret) + .set(active).equalTo(record::getActive); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default UpdateDSL> updateByExampleSelective(SebClientCredentialsRecord record) { + return UpdateDSL.updateWithMapper(this::update, sebClientCredentialsRecord) + .set(institutionId).equalToWhenPresent(record::getInstitutionId) + .set(name).equalToWhenPresent(record::getName) + .set(date).equalToWhenPresent(record::getDate) + .set(clientName).equalToWhenPresent(record::getClientName) + .set(clientSecret).equalToWhenPresent(record::getClientSecret) + .set(active).equalToWhenPresent(record::getActive); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default int updateByPrimaryKey(SebClientCredentialsRecord record) { + return UpdateDSL.updateWithMapper(this::update, sebClientCredentialsRecord) + .set(institutionId).equalTo(record::getInstitutionId) + .set(name).equalTo(record::getName) + .set(date).equalTo(record::getDate) + .set(clientName).equalTo(record::getClientName) + .set(clientSecret).equalTo(record::getClientSecret) + .set(active).equalTo(record::getActive) + .where(id, isEqualTo(record::getId)) + .build() + .execute(); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + default int updateByPrimaryKeySelective(SebClientCredentialsRecord record) { + return UpdateDSL.updateWithMapper(this::update, sebClientCredentialsRecord) + .set(institutionId).equalToWhenPresent(record::getInstitutionId) + .set(name).equalToWhenPresent(record::getName) + .set(date).equalToWhenPresent(record::getDate) + .set(clientName).equalToWhenPresent(record::getClientName) + .set(clientSecret).equalToWhenPresent(record::getClientSecret) + .set(active).equalToWhenPresent(record::getActive) + .where(id, isEqualTo(record::getId)) + .build() + .execute(); + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="Source Table: exam") + @SelectProvider(type=SqlProviderAdapter.class, method="select") + @ConstructorArgs({@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true)}) + List selectIds(SelectStatementProvider select); + + default QueryExpressionDSL>> selectIdsByExample() { + return SelectDSL.selectDistinctWithMapper(this::selectIds, id) + .from(sebClientCredentialsRecord); + } +} \ No newline at end of file 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 26472e5a..ee24963b 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="2019-02-25T10:55:53.694+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source Table: threshold") public static final ThresholdRecord thresholdRecord = new ThresholdRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source field: threshold.id") public static final SqlColumn id = thresholdRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source field: threshold.indicator_id") public static final SqlColumn indicatorId = thresholdRecord.indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source field: threshold.value") public static final SqlColumn value = thresholdRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source field: threshold.color") public static final SqlColumn color = thresholdRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01: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 733eb43b..f1a12723 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="2019-02-25T10:55:53.694+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source Table: threshold") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01: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="2019-02-25T10:55:53.694+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01:00", comments="Source Table: threshold") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01:00", comments="Source Table: threshold") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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="2019-02-25T10:55:53.695+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01: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 c03dce58..a79efccc 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="2019-02-25T10:55:53.714+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01:00", comments="Source Table: user_activity_log") public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.id") public static final SqlColumn id = userActivityLogRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.user_uuid") public static final SqlColumn userUuid = userActivityLogRecord.userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.timestamp") public static final SqlColumn timestamp = userActivityLogRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.activity_type") public static final SqlColumn activityType = userActivityLogRecord.activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.715+01:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.entity_type") public static final SqlColumn entityType = userActivityLogRecord.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.715+01:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.entity_id") public static final SqlColumn entityId = userActivityLogRecord.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.715+01:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.message") public static final SqlColumn message = userActivityLogRecord.message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01: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 7e2f1c21..139cf41d 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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.844+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.844+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.844+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.844+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.844+01:00", comments="Source Table: user_activity_log") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.844+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.844+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.844+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.850+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.850+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.850+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.850+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.851+01: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="2019-02-25T10:55:53.715+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.852+01: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="2019-02-25T10:55:53.716+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.852+01: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 1a94d3e2..4fcaf854 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 @@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class UserRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01:00", comments="Source Table: user") public static final UserRecord userRecord = new UserRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01:00", comments="Source field: user.id") public static final SqlColumn id = userRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01:00", comments="Source field: user.institution_id") public static final SqlColumn institutionId = userRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01:00", comments="Source field: user.uuid") public static final SqlColumn uuid = userRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01:00", comments="Source field: user.name") public static final SqlColumn name = userRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.836+01:00", comments="Source field: user.username") public static final SqlColumn username = userRecord.username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.837+01:00", comments="Source field: user.password") public static final SqlColumn password = userRecord.password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.837+01:00", comments="Source field: user.email") public static final SqlColumn email = userRecord.email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.837+01:00", comments="Source field: user.language") public static final SqlColumn language = userRecord.language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.837+01:00", comments="Source field: user.timezone") public static final SqlColumn timezone = userRecord.timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.837+01:00", comments="Source field: user.active") public static final SqlColumn active = userRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01: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 54bde5a7..29c85f9b 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 @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface UserRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01: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="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface UserRecordMapper { }) UserRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -77,22 +77,22 @@ public interface UserRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01: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="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") default int insert(UserRecord record) { return insert(SqlBuilder.insert(record) .into(userRecord) @@ -117,7 +117,7 @@ public interface UserRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") default int insertSelective(UserRecord record) { return insert(SqlBuilder.insert(record) .into(userRecord) @@ -134,19 +134,19 @@ public interface UserRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") default UserRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, username, password, email, language, timezone, active) .from(userRecord) @@ -155,7 +155,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") default UpdateDSL> updateByExample(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -169,7 +169,7 @@ public interface UserRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") default UpdateDSL> updateByExampleSelective(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -183,7 +183,7 @@ public interface UserRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.709+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.839+01:00", comments="Source Table: user") default int updateByPrimaryKey(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -200,7 +200,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.709+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.839+01: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/model/AdditionalAttributes.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java index 4175f0a9..399d9b71 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java @@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class AdditionalAttributes { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.entity_id") private Long entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source Table: additional_attributes") public AdditionalAttributes(Long id, String entityType, Long entityId, String name, String value) { this.id = id; this.entityType = entityType; @@ -27,27 +27,27 @@ public class AdditionalAttributes { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.entity_id") public Long getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.value") public String getValue() { return value; } @@ -56,7 +56,7 @@ public class AdditionalAttributes { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class AdditionalAttributes { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class AdditionalAttributes { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 8a627f66..c5421b9d 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,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientConnectionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.user_name") private String userName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.vdi") private Boolean vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.client_address") private String clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.virtual_client_address") private String virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source Table: client_connection") public ClientConnectionRecord(Long id, Long examId, String status, String connectionToken, String userName, Boolean vdi, String clientAddress, String virtualClientAddress) { this.id = id; this.examId = examId; @@ -39,42 +39,42 @@ public class ClientConnectionRecord { this.virtualClientAddress = virtualClientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.user_name") public String getUserName() { return userName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.vdi") public Boolean getVdi() { return vdi; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.client_address") public String getClientAddress() { return clientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.virtual_client_address") public String getVirtualClientAddress() { return virtualClientAddress; } @@ -83,7 +83,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 b175d5f3..ec01798f 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="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.connection_id") private Long connectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.user_identifier") private String userIdentifier; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.796+01:00", comments="Source field: client_event.numeric_value") private BigDecimal numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.797+01:00", comments="Source field: client_event.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source Table: client_event") public ClientEventRecord(Long id, Long connectionId, String userIdentifier, Integer type, Long timestamp, BigDecimal numericValue, String text) { this.id = id; this.connectionId = connectionId; @@ -36,37 +36,37 @@ public class ClientEventRecord { this.text = text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.connection_id") public Long getConnectionId() { return connectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.user_identifier") public String getUserIdentifier() { return userIdentifier; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.796+01:00", comments="Source field: client_event.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.796+01:00", comments="Source field: client_event.numeric_value") public BigDecimal getNumericValue() { return numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.797+01:00", comments="Source field: client_event.text") public String getText() { return text; } @@ -75,7 +75,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -98,7 +98,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -125,7 +125,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java index 58402fc4..46396ff0 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="2019-02-25T10:55:53.502+01:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.425+01:00", comments="Source field: configuration_attribute.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.parent_id") private Long parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.resources") private String resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.428+01:00", comments="Source field: configuration_attribute.validator") private String validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.428+01:00", comments="Source field: configuration_attribute.dependencies") private String dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.429+01:00", comments="Source field: configuration_attribute.default_value") private String defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.496+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.417+01: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="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.426+01:00", comments="Source field: configuration_attribute.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.parent_id") public Long getParentId() { return parentId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.428+01:00", comments="Source field: configuration_attribute.resources") public String getResources() { return resources; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.428+01:00", comments="Source field: configuration_attribute.validator") public String getValidator() { return validator; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.428+01:00", comments="Source field: configuration_attribute.dependencies") public String getDependencies() { return dependencies; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.429+01:00", comments="Source field: configuration_attribute.default_value") public String getDefaultValue() { return defaultValue; } @@ -83,7 +83,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 2fa4d321..f2c7f621 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="2019-02-25T10:55:53.660+01:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source field: configuration_node.template") private String template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source field: configuration_node.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.771+01:00", comments="Source Table: configuration_node") public ConfigurationNodeRecord(Long id, Long institutionId, String owner, String name, String description, String type, String template, Integer active) { this.id = id; this.institutionId = institutionId; @@ -39,42 +39,42 @@ public class ConfigurationNodeRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source field: configuration_node.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source field: configuration_node.template") public String getTemplate() { return template; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source field: configuration_node.active") public Integer getActive() { return active; } @@ -83,7 +83,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 c95ae3f6..69f6a26c 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,22 +4,22 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class ConfigurationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.765+01:00", comments="Source field: configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.765+01:00", comments="Source field: configuration.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.version") private String version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.version_date") private DateTime versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.followup") private Integer followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.765+01:00", comments="Source Table: configuration") public ConfigurationRecord(Long id, Long configurationNodeId, String version, DateTime versionDate, Integer followup) { this.id = id; this.configurationNodeId = configurationNodeId; @@ -28,27 +28,27 @@ public class ConfigurationRecord { this.followup = followup; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.765+01:00", comments="Source field: configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.version") public String getVersion() { return version; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.version_date") public DateTime getVersionDate() { return versionDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.followup") public Integer getFollowup() { return followup; } @@ -57,7 +57,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -78,7 +78,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -103,7 +103,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 a39abf9f..d5a4f803 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="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.744+01:00", comments="Source field: configuration_value.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.744+01:00", comments="Source field: configuration_value.configuration_id") private Long configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.744+01:00", comments="Source field: configuration_value.configuration_attribute_id") private Long configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.745+01:00", comments="Source field: configuration_value.list_index") private Integer listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.745+01:00", comments="Source field: configuration_value.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.647+01:00", comments="Source field: configuration_value.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.746+01:00", comments="Source field: configuration_value.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.744+01:00", comments="Source Table: configuration_value") public ConfigurationValueRecord(Long id, Long configurationId, Long configurationAttributeId, Integer listIndex, String value, String text) { this.id = id; this.configurationId = configurationId; @@ -31,32 +31,32 @@ public class ConfigurationValueRecord { this.text = text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.744+01:00", comments="Source field: configuration_value.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.744+01:00", comments="Source field: configuration_value.configuration_id") public Long getConfigurationId() { return configurationId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.745+01:00", comments="Source field: configuration_value.configuration_attribute_id") public Long getConfigurationAttributeId() { return configurationAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.745+01:00", comments="Source field: configuration_value.list_index") public Integer getListIndex() { return listIndex; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.647+01:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.745+01:00", comments="Source field: configuration_value.value") public String getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source field: configuration_value.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.746+01:00", comments="Source field: configuration_value.text") public String getText() { return text; } @@ -65,7 +65,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 5fb6cd01..e8879dae 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,19 +3,19 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamConfigurationMapRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.778+01:00", comments="Source field: exam_configuration_map.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.778+01:00", comments="Source field: exam_configuration_map.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.778+01:00", comments="Source field: exam_configuration_map.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.779+01:00", comments="Source field: exam_configuration_map.user_names") private String userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.778+01:00", comments="Source Table: exam_configuration_map") public ExamConfigurationMapRecord(Long id, Long examId, Long configurationNodeId, String userNames) { this.id = id; this.examId = examId; @@ -23,22 +23,22 @@ public class ExamConfigurationMapRecord { this.userNames = userNames; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.778+01:00", comments="Source field: exam_configuration_map.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.778+01:00", comments="Source field: exam_configuration_map.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.779+01:00", comments="Source field: exam_configuration_map.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.779+01:00", comments="Source field: exam_configuration_map.user_names") public String getUserNames() { return userNames; } @@ -47,7 +47,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -67,7 +67,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -91,7 +91,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 180f4568..a0d0d442 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,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.lms_setup_id") private Long lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.external_id") private String externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.quit_password") private String quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.784+01:00", comments="Source Table: exam") public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String status, String quitPassword, Integer active) { this.id = id; this.institutionId = institutionId; @@ -47,52 +47,52 @@ public class ExamRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.lms_setup_id") public Long getLmsSetupId() { return lmsSetupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.external_id") public String getExternalId() { return externalId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.quit_password") public String getQuitPassword() { return quitPassword; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.active") public Integer getActive() { return active; } @@ -101,7 +101,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 6caa7569..0e49f917 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="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.806+01:00", comments="Source field: indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.806+01:00", comments="Source field: indicator.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.806+01: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="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.806+01:00", comments="Source field: indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01: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 Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 8e42a053..1745491f 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,51 +3,60 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class InstitutionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.url_suffix") private String urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.theme_name") + private String themeName; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.logo_image") private String logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source Table: institution") - public InstitutionRecord(Long id, String name, String urlSuffix, Integer active, String logoImage) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01: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; this.urlSuffix = urlSuffix; + this.themeName = themeName; this.active = active; this.logoImage = logoImage; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.url_suffix") public String getUrlSuffix() { return urlSuffix; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.theme_name") + public String getThemeName() { + return themeName; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.logo_image") public String getLogoImage() { return logoImage; } @@ -56,7 +65,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -67,6 +76,7 @@ public class InstitutionRecord { sb.append(", id=").append(id); sb.append(", name=").append(name); sb.append(", urlSuffix=").append(urlSuffix); + sb.append(", themeName=").append(themeName); sb.append(", active=").append(active); sb.append(", logoImage=").append(logoImage); sb.append("]"); @@ -77,7 +87,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -94,6 +104,7 @@ public class InstitutionRecord { return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) && (this.getUrlSuffix() == null ? other.getUrlSuffix() == null : this.getUrlSuffix().equals(other.getUrlSuffix())) + && (this.getThemeName() == null ? other.getThemeName() == null : this.getThemeName().equals(other.getThemeName())) && (this.getActive() == null ? other.getActive() == null : this.getActive().equals(other.getActive())) && (this.getLogoImage() == null ? other.getLogoImage() == null : this.getLogoImage().equals(other.getLogoImage())); } @@ -102,7 +113,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public int hashCode() { @@ -111,6 +122,7 @@ public class InstitutionRecord { result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + ((getUrlSuffix() == null) ? 0 : getUrlSuffix().hashCode()); + result = prime * result + ((getThemeName() == null) ? 0 : getThemeName().hashCode()); result = prime * result + ((getActive() == null) ? 0 : getActive().hashCode()); result = prime * result + ((getLogoImage() == null) ? 0 : getLogoImage().hashCode()); return result; 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 21fa2ffc..88ed38c3 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,41 +3,35 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class LmsSetupRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.827+01:00", comments="Source field: lms_setup.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_type") private String lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_url") private String lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_clientname") private String lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.829+01:00", comments="Source field: lms_setup.lms_clientsecret") private String lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.829+01:00", comments="Source field: lms_setup.lms_rest_api_token") private String lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.seb_clientname") - private String sebClientname; - - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.seb_clientsecret") - private String sebClientsecret; - - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.829+01:00", comments="Source field: lms_setup.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01: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 sebClientname, String sebClientsecret, Integer active) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.827+01:00", comments="Source Table: lms_setup") + public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, Integer active) { this.id = id; this.institutionId = institutionId; this.name = name; @@ -46,62 +40,50 @@ public class LmsSetupRecord { this.lmsClientname = lmsClientname; this.lmsClientsecret = lmsClientsecret; this.lmsRestApiToken = lmsRestApiToken; - this.sebClientname = sebClientname; - this.sebClientsecret = sebClientsecret; this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.827+01:00", comments="Source field: lms_setup.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_type") public String getLmsType() { return lmsType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_url") public String getLmsUrl() { return lmsUrl; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_clientname") public String getLmsClientname() { return lmsClientname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.829+01:00", comments="Source field: lms_setup.lms_clientsecret") public String getLmsClientsecret() { return lmsClientsecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.829+01:00", comments="Source field: lms_setup.lms_rest_api_token") public String getLmsRestApiToken() { return lmsRestApiToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.seb_clientname") - public String getSebClientname() { - return sebClientname; - } - - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.seb_clientsecret") - public String getSebClientsecret() { - return sebClientsecret; - } - - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.829+01:00", comments="Source field: lms_setup.active") public Integer getActive() { return active; } @@ -110,7 +92,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -126,8 +108,6 @@ public class LmsSetupRecord { sb.append(", lmsClientname=").append(lmsClientname); sb.append(", lmsClientsecret=").append(lmsClientsecret); sb.append(", lmsRestApiToken=").append(lmsRestApiToken); - sb.append(", sebClientname=").append(sebClientname); - sb.append(", sebClientsecret=").append(sebClientsecret); sb.append(", active=").append(active); sb.append("]"); return sb.toString(); @@ -137,7 +117,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -159,8 +139,6 @@ public class LmsSetupRecord { && (this.getLmsClientname() == null ? other.getLmsClientname() == null : this.getLmsClientname().equals(other.getLmsClientname())) && (this.getLmsClientsecret() == null ? other.getLmsClientsecret() == null : this.getLmsClientsecret().equals(other.getLmsClientsecret())) && (this.getLmsRestApiToken() == null ? other.getLmsRestApiToken() == null : this.getLmsRestApiToken().equals(other.getLmsRestApiToken())) - && (this.getSebClientname() == null ? other.getSebClientname() == null : this.getSebClientname().equals(other.getSebClientname())) - && (this.getSebClientsecret() == null ? other.getSebClientsecret() == null : this.getSebClientsecret().equals(other.getSebClientsecret())) && (this.getActive() == null ? other.getActive() == null : this.getActive().equals(other.getActive())); } @@ -168,7 +146,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public int hashCode() { @@ -182,8 +160,6 @@ public class LmsSetupRecord { result = prime * result + ((getLmsClientname() == null) ? 0 : getLmsClientname().hashCode()); result = prime * result + ((getLmsClientsecret() == null) ? 0 : getLmsClientsecret().hashCode()); result = prime * result + ((getLmsRestApiToken() == null) ? 0 : getLmsRestApiToken().hashCode()); - result = prime * result + ((getSebClientname() == null) ? 0 : getSebClientname().hashCode()); - result = prime * result + ((getSebClientsecret() == null) ? 0 : getSebClientsecret().hashCode()); result = prime * result + ((getActive() == null) ? 0 : getActive().hashCode()); return result; } 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 bb35da7f..68b9a868 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,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class OrientationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.751+01:00", comments="Source field: orientation.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.config_attribute_id") private Long configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source field: orientation.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.template") private String template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.view") private String view; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.group") private String group; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.x_position") private Integer xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.y_position") private Integer yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.width") private Integer width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.height") private Integer height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.751+01:00", comments="Source Table: orientation") public OrientationRecord(Long id, Long configAttributeId, String template, String view, String group, Integer xPosition, Integer yPosition, Integer width, Integer height) { this.id = id; this.configAttributeId = configAttributeId; @@ -43,47 +43,47 @@ public class OrientationRecord { this.height = height; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.config_attribute_id") public Long getConfigAttributeId() { return configAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.template") public String getTemplate() { return template; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.view") public String getView() { return view; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.group") public String getGroup() { return group; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.x_position") public Integer getxPosition() { return xPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.y_position") public Integer getyPosition() { return yPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.width") public Integer getWidth() { return width; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.height") public Integer getHeight() { return height; } @@ -92,7 +92,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 789d4054..0e86759a 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="2019-02-25T10:55:53.710+01:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.839+01:00", comments="Source field: user_role.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.839+01:00", comments="Source field: user_role.user_id") private Long userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.role_name") private String roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.710+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.839+01: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="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.839+01:00", comments="Source field: user_role.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.user_id") public Long getUserId() { return userId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.role_name") public String getRoleName() { return roleName; } @@ -38,7 +38,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -57,7 +57,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -80,7 +80,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientCredentialsRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientCredentialsRecord.java new file mode 100644 index 00000000..0710bf91 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientCredentialsRecord.java @@ -0,0 +1,143 @@ +package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; + +import java.util.Date; +import javax.annotation.Generated; + +public class SebClientCredentialsRecord { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.id") + private Long id; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.institution_id") + private Long institutionId; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.name") + private String name; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.date") + private Date date; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.client_name") + private String clientName; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.client_secret") + private String clientSecret; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.active") + private Integer active; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source Table: seb_client_credentials") + public SebClientCredentialsRecord(Long id, Long institutionId, String name, Date date, String clientName, String clientSecret, Integer active) { + this.id = id; + this.institutionId = institutionId; + this.name = name; + this.date = date; + this.clientName = clientName; + this.clientSecret = clientSecret; + this.active = active; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.id") + public Long getId() { + return id; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.institution_id") + public Long getInstitutionId() { + return institutionId; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.name") + public String getName() { + return name; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.date") + public Date getDate() { + return date; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.client_name") + public String getClientName() { + return clientName; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.822+01:00", comments="Source field: seb_client_credentials.client_secret") + public String getClientSecret() { + return clientSecret; + } + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.823+01:00", comments="Source field: seb_client_credentials.active") + public Integer getActive() { + return active; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table seb_client_credentials + * + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", institutionId=").append(institutionId); + sb.append(", name=").append(name); + sb.append(", date=").append(date); + sb.append(", clientName=").append(clientName); + sb.append(", clientSecret=").append(clientSecret); + sb.append(", active=").append(active); + sb.append("]"); + return sb.toString(); + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table seb_client_credentials + * + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + */ + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + SebClientCredentialsRecord other = (SebClientCredentialsRecord) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getInstitutionId() == null ? other.getInstitutionId() == null : this.getInstitutionId().equals(other.getInstitutionId())) + && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) + && (this.getDate() == null ? other.getDate() == null : this.getDate().equals(other.getDate())) + && (this.getClientName() == null ? other.getClientName() == null : this.getClientName().equals(other.getClientName())) + && (this.getClientSecret() == null ? other.getClientSecret() == null : this.getClientSecret().equals(other.getClientSecret())) + && (this.getActive() == null ? other.getActive() == null : this.getActive().equals(other.getActive())); + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table seb_client_credentials + * + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getInstitutionId() == null) ? 0 : getInstitutionId().hashCode()); + result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); + result = prime * result + ((getDate() == null) ? 0 : getDate().hashCode()); + result = prime * result + ((getClientName() == null) ? 0 : getClientName().hashCode()); + result = prime * result + ((getClientSecret() == null) ? 0 : getClientSecret().hashCode()); + result = prime * result + ((getActive() == null) ? 0 : getActive().hashCode()); + return result; + } +} \ No newline at end of file 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 ed19a06b..42b3e3d0 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="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.813+01:00", comments="Source field: threshold.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.813+01:00", comments="Source field: threshold.indicator_id") private Long indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.813+01:00", comments="Source field: threshold.value") private BigDecimal value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.814+01:00", comments="Source field: threshold.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.812+01: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="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.813+01:00", comments="Source field: threshold.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.813+01:00", comments="Source field: threshold.indicator_id") public Long getIndicatorId() { return indicatorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.814+01:00", comments="Source field: threshold.value") public BigDecimal getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.814+01: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 Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 d08e2491..091eda2e 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="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.user_uuid") private String userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.activity_type") private String activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.entity_id") private String entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.message") private String message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01: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="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.user_uuid") public String getUserUuid() { return userUuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.activity_type") public String getActivityType() { return activityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.entity_id") public String getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.message") public String getMessage() { return message; } @@ -74,7 +74,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -97,7 +97,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -124,7 +124,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @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 515b277c..496ec6f0 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 @@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class UserRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.833+01:00", comments="Source field: user.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.username") private String username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.password") private String password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.email") private String email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.language") private String language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.timezone") private String timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.704+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.833+01:00", comments="Source Table: user") public UserRecord(Long id, Long institutionId, String uuid, String name, String username, String password, String email, String language, String timezone, Integer active) { this.id = id; this.institutionId = institutionId; @@ -47,52 +47,52 @@ public class UserRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.username") public String getUsername() { return username; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.password") public String getPassword() { return password; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.email") public String getEmail() { return email; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.language") public String getLanguage() { return language; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.timezone") public String getTimezone() { return timezone; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.active") public Integer getActive() { return active; } @@ -101,7 +101,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Feb 25 10:55:53 CET 2019 + * @mbg.generated Thu Mar 07 15:53:05 CET 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/LmsSetupDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/LmsSetupDAO.java index 5d7a7d43..c8bc4a64 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/LmsSetupDAO.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/LmsSetupDAO.java @@ -16,8 +16,6 @@ public interface LmsSetupDAO extends ActivatableEntityDAO, B Result getLmsAPIAccessCredentials(String lmsSetupId); - Result getSEBClientCredentials(String lmsSetupId); - final class Credentials { public final String clientId; public final String secret; diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/InstitutionDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/InstitutionDAOImpl.java index b32bffe5..90fd402d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/InstitutionDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/InstitutionDAOImpl.java @@ -146,6 +146,7 @@ public class InstitutionDAOImpl implements InstitutionDAO { institution.id, institution.name, institution.urlSuffix, + institution.themeName, null, institution.logoImage); @@ -174,6 +175,7 @@ public class InstitutionDAOImpl implements InstitutionDAO { null, institution.name, institution.urlSuffix, + institution.themeName, BooleanUtils.toInteger(false), institution.logoImage); @@ -191,7 +193,7 @@ public class InstitutionDAOImpl implements InstitutionDAO { final List ids = extractPKsFromKeys(all); final InstitutionRecord institutionRecord = new InstitutionRecord( - null, null, null, BooleanUtils.toInteger(active), null); + null, null, null, null, BooleanUtils.toInteger(active), null); this.institutionRecordMapper.updateByExampleSelective(institutionRecord) .where(InstitutionRecordDynamicSqlSupport.id, isIn(ids)) @@ -279,6 +281,7 @@ public class InstitutionDAOImpl implements InstitutionDAO { record.getName(), record.getUrlSuffix(), record.getLogoImage(), + record.getThemeName(), BooleanUtils.toBooleanObject(record.getActive()))); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/LmsSetupDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/LmsSetupDAOImpl.java index a0be67a0..ec22e67c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/LmsSetupDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/LmsSetupDAOImpl.java @@ -21,13 +21,10 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.mybatis.dynamic.sql.select.MyBatis3SelectModelAdapter; import org.mybatis.dynamic.sql.select.QueryExpressionDSL; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Lazy; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import ch.ethz.seb.sebserver.WebSecurityConfig; import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; @@ -50,16 +47,13 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { private final LmsSetupRecordMapper lmsSetupRecordMapper; private final InternalEncryptionService internalEncryptionService; - private final PasswordEncoder clientPasswordEncoder; protected LmsSetupDAOImpl( final LmsSetupRecordMapper lmsSetupRecordMapper, - final InternalEncryptionService internalEncryptionService, - @Qualifier(WebSecurityConfig.CLIENT_PASSWORD_ENCODER_BEAN_NAME) final PasswordEncoder clientPasswordEncoder) { + final InternalEncryptionService internalEncryptionService) { this.lmsSetupRecordMapper = lmsSetupRecordMapper; this.internalEncryptionService = internalEncryptionService; - this.clientPasswordEncoder = clientPasswordEncoder; } @Override @@ -148,8 +142,6 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { ? this.internalEncryptionService.encrypt(lmsSetup.lmsAuthSecret) : null, lmsSetup.lmsRestApiToken, - null, - null, null); this.lmsSetupRecordMapper.updateByPrimaryKeySelective(newRecord); @@ -175,10 +167,6 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { ? this.internalEncryptionService.encrypt(lmsSetup.lmsAuthSecret) : null, lmsSetup.lmsRestApiToken, - lmsSetup.sebAuthName, - (StringUtils.isNotBlank(lmsSetup.sebAuthSecret)) - ? this.internalEncryptionService.encrypt(lmsSetup.sebAuthSecret) - : null, BooleanUtils.toInteger(false)); this.lmsSetupRecordMapper.insert(newRecord); @@ -195,7 +183,7 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { final List ids = extractPKsFromKeys(all); final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord( - null, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null, null, null, BooleanUtils.toIntegerObject(active)); this.lmsSetupRecordMapper.updateByExampleSelective(lmsSetupRecord) @@ -284,20 +272,6 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { }); } - @Override - @Transactional(readOnly = true) - public Result getSEBClientCredentials(final String lmsSetupId) { - return Result.tryCatch(() -> { - final LmsSetupRecord record = this.lmsSetupRecordMapper - .selectByPrimaryKey(Long.parseLong(lmsSetupId)); - - return new Credentials( - record.getSebClientname(), - record.getSebClientsecret(), - null); - }); - } - private Result> allIdsOfInstitution(final EntityKey institutionKey) { return Result.tryCatch(() -> { return this.lmsSetupRecordMapper.selectIdsByExample() @@ -333,8 +307,6 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { null, record.getLmsUrl(), record.getLmsRestApiToken(), - record.getSebClientname(), - null, BooleanUtils.toBooleanObject(record.getActive()))); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/LmsSetupController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/LmsSetupController.java index 8bcbd385..415a6a08 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/LmsSetupController.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/LmsSetupController.java @@ -14,12 +14,10 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import org.apache.commons.lang3.StringUtils; import org.apache.tomcat.util.http.fileupload.IOUtils; import org.mybatis.dynamic.sql.SqlTable; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -32,7 +30,6 @@ import ch.ethz.seb.sebserver.gbl.authorization.PrivilegeType; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetupTestResult; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; -import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.LmsSetupRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService; import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationService; @@ -40,7 +37,6 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionServic import ch.ethz.seb.sebserver.webservice.servicelayer.dao.LmsSetupDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPIService; -import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationException; import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationService; @WebServiceProfile @@ -118,50 +114,50 @@ public class LmsSetupController extends ActivatableEntityController validForCreate(final LmsSetup entity) { - - final SEBClientAuth clientAuth = new SEBClientAuth(entity.sebAuthName, entity.sebAuthSecret); - - final Result result = super.validForCreate(entity); - if (result.hasError()) { - final Throwable error = result.getError(); - if (error instanceof BeanValidationException) { - final BeanValidationException beanValidationException = (BeanValidationException) error; - final Result validateSebAuth = this.beanValidationService.validateBean(clientAuth); - if (validateSebAuth.hasError()) { - final Throwable sebAuthError = validateSebAuth.getError(); - if (sebAuthError instanceof BeanValidationException) { - final BindingResult bindingResult = beanValidationException.getBindingResult(); - bindingResult.addAllErrors(((BeanValidationException) sebAuthError).getBindingResult()); - return Result.ofError(new BeanValidationException(bindingResult)); - } else { - return validateSebAuth - .map(ce -> entity); - } - } - } - return result; - } else { - return this.beanValidationService.validateBean(clientAuth) - .map(ca -> entity); - } - } - - @Override - protected Result validForSave(final LmsSetup entity) { - return super.validForSave(entity) - .map(setup -> { - - if (StringUtils.isNoneBlank(entity.sebAuthName) - || StringUtils.isNoneBlank(entity.sebAuthSecret)) { - - throw new IllegalAPIArgumentException( - "SEB Client Authentication cannot be changed after creation"); - } - return setup; - }); - } +// @Override +// protected Result validForCreate(final LmsSetup entity) { +// +// final SEBClientAuth clientAuth = new SEBClientAuth(entity.sebAuthName, entity.sebAuthSecret); +// +// final Result result = super.validForCreate(entity); +// if (result.hasError()) { +// final Throwable error = result.getError(); +// if (error instanceof BeanValidationException) { +// final BeanValidationException beanValidationException = (BeanValidationException) error; +// final Result validateSebAuth = this.beanValidationService.validateBean(clientAuth); +// if (validateSebAuth.hasError()) { +// final Throwable sebAuthError = validateSebAuth.getError(); +// if (sebAuthError instanceof BeanValidationException) { +// final BindingResult bindingResult = beanValidationException.getBindingResult(); +// bindingResult.addAllErrors(((BeanValidationException) sebAuthError).getBindingResult()); +// return Result.ofError(new BeanValidationException(bindingResult)); +// } else { +// return validateSebAuth +// .map(ce -> entity); +// } +// } +// } +// return result; +// } else { +// return this.beanValidationService.validateBean(clientAuth) +// .map(ca -> entity); +// } +// } +// +// @Override +// protected Result validForSave(final LmsSetup entity) { +// return super.validForSave(entity) +// .map(setup -> { +// +// if (StringUtils.isNoneBlank(entity.sebAuthName) +// || StringUtils.isNoneBlank(entity.sebAuthSecret)) { +// +// throw new IllegalAPIArgumentException( +// "SEB Client Authentication cannot be changed after creation"); +// } +// return setup; +// }); +// } public static final class SEBClientAuth { @@ -174,6 +170,7 @@ public class LmsSetupController extends ActivatableEntityController page = new Page<>(2, 1, "name", Arrays.asList( - new Institution(1L, "InstOne", "one", "", true), - new Institution(2L, "InstTwo", "two", "", true), - new Institution(3L, "InstThree", "three", "", true))); + new Institution(1L, "InstOne", "one", "", "", true), + new Institution(2L, "InstTwo", "two", "", "", true), + new Institution(3L, "InstThree", "three", "", "", true))); final JSONMapper jsonMapper = new JSONMapper(); //final ObjectWriter writerWithDefaultPrettyPrinter = jsonMapper.writerWithDefaultPrettyPrinter(); String json = jsonMapper.writeValueAsString(page); assertEquals( - "{\"number_of_pages\":2,\"page_number\":1,\"sort\":\"name\",\"content\":[{\"id\":1,\"name\":\"InstOne\",\"urlSuffix\":\"one\",\"logoImage\":\"\",\"active\":true},{\"id\":2,\"name\":\"InstTwo\",\"urlSuffix\":\"two\",\"logoImage\":\"\",\"active\":true},{\"id\":3,\"name\":\"InstThree\",\"urlSuffix\":\"three\",\"logoImage\":\"\",\"active\":true}],\"page_size\":3}", + "{\"number_of_pages\":2,\"page_number\":1,\"sort\":\"name\",\"content\":[{\"id\":1,\"name\":\"InstOne\",\"urlSuffix\":\"one\",\"logoImage\":\"\",\"themeName\":\"\",\"active\":true},{\"id\":2,\"name\":\"InstTwo\",\"urlSuffix\":\"two\",\"logoImage\":\"\",\"themeName\":\"\",\"active\":true},{\"id\":3,\"name\":\"InstThree\",\"urlSuffix\":\"three\",\"logoImage\":\"\",\"themeName\":\"\",\"active\":true}],\"page_size\":3}", json); final List namesList = page.content.stream() diff --git a/src/test/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetupTest.java b/src/test/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetupTest.java index 8c8e434c..cd020fe8 100644 --- a/src/test/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetupTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/gbl/model/institution/LmsSetupTest.java @@ -23,7 +23,7 @@ public class LmsSetupTest { @Test public void testDeserialization() throws JsonParseException, JsonMappingException, IOException { final String jsonString = - "{\"id\":1,\"institutionId\":1,\"name\":\"new LmsSetup 1\",\"lmsType\":\"MOCKUP\",\"lmsClientname\":\"lms1Name\",\"lmsClientsecret\":\"lms1Secret\",\"lmsUrl\":\"https://www.lms1.com\",\"lmsRestApiToken\":null,\"sebClientname\":\"seb1Name\",\"sebClientsecret\":\"seb1Secret\",\"active\":false}"; + "{\"id\":1,\"institutionId\":1,\"name\":\"new LmsSetup 1\",\"lmsType\":\"MOCKUP\",\"lmsClientname\":\"lms1Name\",\"lmsClientsecret\":\"lms1Secret\",\"lmsUrl\":\"https://www.lms1.com\",\"lmsRestApiToken\":null,\"active\":false}"; final LmsSetup lmsSetup = new ObjectMapper().readValue(jsonString, LmsSetup.class); assertNotNull(lmsSetup); diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java index b7246596..1af595e1 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java @@ -243,7 +243,7 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester { .withAccessToken(sebAdminAccess) .withPath(API.INSTITUTION_ENDPOINT) .withMethod(HttpMethod.PUT) - .withBodyJson(new Institution(institution.id, "testInstitution", "testSuffix", null, null)) + .withBodyJson(new Institution(institution.id, "testInstitution", "testSuffix", null, null, null)) .withExpectedStatus(HttpStatus.OK) .getAsObject(new TypeReference() { }); diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/LmsSetupAPITest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/LmsSetupAPITest.java index 16450204..532d7031 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/LmsSetupAPITest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/LmsSetupAPITest.java @@ -41,8 +41,6 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { .withAttribute(Domain.LMS_SETUP.ATTR_INSTITUTION_ID, "1") .withAttribute(Domain.LMS_SETUP.ATTR_NAME, "new LmsSetup 1") .withAttribute(Domain.LMS_SETUP.ATTR_LMS_TYPE, LmsType.MOCKUP.name()) - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTNAME, "seb1Name") - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTSECRET, "12345678") .withExpectedStatus(HttpStatus.OK) .getAsObject(new TypeReference() { }); @@ -55,7 +53,7 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { assertFalse(lmsSetup.active); // set lms server and credentials - LmsSetup modified = new LmsSetup( + final LmsSetup modified = new LmsSetup( lmsSetup.id, lmsSetup.institutionId, lmsSetup.name, @@ -64,8 +62,6 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { "lms1Secret", "https://www.lms1.com", null, - null, - null, null); lmsSetup = new RestAPITestHelper() @@ -83,40 +79,10 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { assertEquals("new LmsSetup 1", lmsSetup.name); assertTrue(LmsType.MOCKUP == lmsSetup.lmsType); assertEquals("lms1Name", lmsSetup.lmsAuthName); - assertEquals("seb1Name", lmsSetup.sebAuthName); // secrets, once set are not exposed assertEquals(null, lmsSetup.lmsAuthSecret); - assertEquals(null, lmsSetup.sebAuthSecret); assertFalse(lmsSetup.active); - // trying to rest seb-client credentials should not be possible - modified = new LmsSetup( - lmsSetup.id, - lmsSetup.institutionId, - lmsSetup.name, - lmsSetup.lmsType, - "lms1Name", - "lms1Secret", - "https://www.lms1.com", - null, - "seb2Name", - "shouldNotBePossible", - null); - - final List errors = new RestAPITestHelper() - .withAccessToken(getAdminInstitution1Access()) - .withPath(API.LMS_SETUP_ENDPOINT) - .withMethod(HttpMethod.PUT) - .withBodyJson(modified) - .withExpectedStatus(HttpStatus.BAD_REQUEST) - .getAsObject(new TypeReference>() { - }); - - assertNotNull(errors); - assertTrue(errors.size() == 1); - assertEquals("SEB Client Authentication cannot be changed after creation", - errors.get(0).details); - // activate EntityProcessingReport report = new RestAPITestHelper() .withAccessToken(getAdminInstitution1Access()) @@ -217,12 +183,11 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { .withMethod(HttpMethod.POST) .withAttribute(Domain.LMS_SETUP.ATTR_INSTITUTION_ID, "1") .withAttribute(Domain.LMS_SETUP.ATTR_NAME, "new LmsSetup 1") - .withAttribute(Domain.LMS_SETUP.ATTR_LMS_TYPE, LmsType.MOCKUP.name()) .getAsObject(new TypeReference>() { }); assertNotNull(errors); - assertTrue(errors.size() == 2); + assertTrue(errors.size() == 1); assertEquals("Field validation error", errors.get(0).systemMessage); } @@ -235,8 +200,6 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { .withMethod(HttpMethod.POST) .withAttribute("name", "new LmsSetup 1") .withAttribute(Domain.LMS_SETUP.ATTR_LMS_TYPE, LmsType.MOCKUP.name()) - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTNAME, "seb1Name") - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTSECRET, "12345678") .withExpectedStatus(HttpStatus.OK) .getAsObject(new TypeReference() { }); @@ -246,8 +209,6 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { .withMethod(HttpMethod.POST) .withAttribute("name", "new LmsSetup 2") .withAttribute(Domain.LMS_SETUP.ATTR_LMS_TYPE, LmsType.MOCKUP.name()) - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTNAME, "seb2Name") - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTSECRET, "12345678") .withExpectedStatus(HttpStatus.OK) .getAsObject(new TypeReference() { }); @@ -274,8 +235,6 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { .withMethod(HttpMethod.POST) .withAttribute("name", "new LmsSetup 1") .withAttribute(Domain.LMS_SETUP.ATTR_LMS_TYPE, LmsType.MOCKUP.name()) - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTNAME, "seb2Name") - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTSECRET, "12345678") .withExpectedStatus(HttpStatus.OK) .getAsObject(new TypeReference() { }); @@ -285,8 +244,6 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { .withMethod(HttpMethod.POST) .withAttribute("name", "new LmsSetup 2") .withAttribute(Domain.LMS_SETUP.ATTR_LMS_TYPE, LmsType.MOCKUP.name()) - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTNAME, "seb2Name") - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTSECRET, "12345678") .withExpectedStatus(HttpStatus.OK) .getAsObject(new TypeReference() { }); @@ -312,8 +269,6 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { .withAttribute(Domain.LMS_SETUP.ATTR_INSTITUTION_ID, "1") .withAttribute("name", "new LmsSetup 1") .withAttribute(Domain.LMS_SETUP.ATTR_LMS_TYPE, LmsType.MOCKUP.name()) - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTNAME, "seb2Name") - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTSECRET, "12345678") .withExpectedStatus(HttpStatus.OK) .getAsObject(new TypeReference() { }).id; @@ -325,8 +280,6 @@ public class LmsSetupAPITest extends AdministrationAPIIntegrationTester { .withAttribute(Domain.LMS_SETUP.ATTR_INSTITUTION_ID, "2") .withAttribute("name", "new LmsSetup 2") .withAttribute(Domain.LMS_SETUP.ATTR_LMS_TYPE, LmsType.MOCKUP.name()) - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTNAME, "seb2Name") - .withAttribute(Domain.LMS_SETUP.ATTR_SEB_CLIENTSECRET, "12345678") .withExpectedStatus(HttpStatus.OK) .getAsObject(new TypeReference() { }).id; diff --git a/src/test/resources/data-test.sql b/src/test/resources/data-test.sql index d347908b..df435d2d 100644 --- a/src/test/resources/data-test.sql +++ b/src/test/resources/data-test.sql @@ -1,7 +1,7 @@ INSERT INTO institution VALUES - (1, 'Institution1', 'inst1', null, 1), - (2, 'Institution2', 'inst2', null, 1), - (3, 'Institution3', 'inst3', null, 0) + (1, 'Institution1', 'inst1', null, null, 1), + (2, 'Institution2', 'inst2', null, null, 1), + (3, 'Institution3', 'inst3', null, null, 0) ; INSERT INTO user VALUES diff --git a/src/test/resources/schema-test.sql b/src/test/resources/schema-test.sql index dbf55df6..e0206999 100644 --- a/src/test/resources/schema-test.sql +++ b/src/test/resources/schema-test.sql @@ -1,6 +1,6 @@ -- ----------------------------------------------------- --- Schema SEBServerDemo +-- Schema SEBServer -- ----------------------------------------------------- -- ----------------------------------------------------- @@ -13,6 +13,7 @@ CREATE TABLE IF NOT EXISTS `institution` ( `name` VARCHAR(255) NOT NULL, `url_suffix` VARCHAR(45) NULL, `logo_image` MEDIUMTEXT NULL, + `theme_name` VARCHAR(45) NULL, `active` INT(1) NOT NULL, PRIMARY KEY (`id`), UNIQUE INDEX `name_UNIQUE` (`name` ASC)) @@ -33,8 +34,6 @@ CREATE TABLE IF NOT EXISTS `lms_setup` ( `lms_clientname` VARCHAR(255) NULL, `lms_clientsecret` VARCHAR(255) NULL, `lms_rest_api_token` VARCHAR(4000) NULL, - `seb_clientname` VARCHAR(255) NOT NULL, - `seb_clientsecret` VARCHAR(255) NOT NULL, `active` INT(1) NOT NULL, PRIMARY KEY (`id`), INDEX `setupInstitutionRef_idx` (`institution_id` ASC), @@ -301,7 +300,7 @@ DROP TABLE IF EXISTS `user` ; CREATE TABLE IF NOT EXISTS `user` ( `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, - `institution_id` BIGINT UNSIGNED NULL, + `institution_id` BIGINT UNSIGNED NOT NULL, `uuid` VARCHAR(255) NOT NULL, `name` VARCHAR(255) NOT NULL, `username` VARCHAR(255) NOT NULL, @@ -312,7 +311,7 @@ CREATE TABLE IF NOT EXISTS `user` ( `active` INT(1) NOT NULL, PRIMARY KEY (`id`), INDEX `institutionRef_idx` (`institution_id` ASC), - CONSTRAINT `institutionRef` + CONSTRAINT `userInstitutionRef` FOREIGN KEY (`institution_id`) REFERENCES `institution` (`id`) ON DELETE NO ACTION @@ -418,3 +417,26 @@ CREATE TABLE IF NOT EXISTS `additional_attributes` ( PRIMARY KEY (`id`)) ; + +-- ----------------------------------------------------- +-- Table `seb_client_credentials` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `seb_client_credentials` ; + +CREATE TABLE IF NOT EXISTS `seb_client_credentials` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `institution_id` BIGINT UNSIGNED NOT NULL, + `name` VARCHAR(255) NOT NULL, + `date` DATETIME NOT NULL, + `client_name` VARCHAR(45) NOT NULL, + `client_secret` VARCHAR(45) NOT NULL, + `active` INT(1) NOT NULL, + PRIMARY KEY (`id`), + INDEX `sebClientCredentialsInstitutionRef_idx` (`institution_id` ASC), + CONSTRAINT `sebClientCredentialsInstitutionRef` + FOREIGN KEY (`institution_id`) + REFERENCES `institution` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; +