diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java b/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java index ece72450..21918db6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java @@ -35,12 +35,14 @@ public final class API { public static final String PRIVILEGES_ENDPOINT = INFO_ENDPOINT + PRIVILEGES_PATH_SEGMENT; public static final String INSTITUTION_ENDPOINT = "/institution"; + public static final String SEB_CONFIG_EXPORT_PATH_SEGMENT = "/sebconfig"; + public static final String SEB_CONFIG_EXPORT_ENDPOINT = INSTITUTION_ENDPOINT + + INSTITUTION_VAR_PATH_SEGMENT + + SEB_CONFIG_EXPORT_PATH_SEGMENT; public static final String LMS_SETUP_ENDPOINT = "/lms_setup"; - public static final String SEB_CONFIG_EXPORT_PATH_SEGMENT = "/sebconfig"; public static final String LMS_SETUP_TEST_PATH_SEGMENT = "/test"; - public static final String SEB_CONFIG_EXPORT_ENDPOINT = LMS_SETUP_ENDPOINT + "/sebconfig"; - public static final String LMS_SETUP_TEST_ENDPOINT = LMS_SETUP_ENDPOINT + "/test"; + public static final String LMS_SETUP_TEST_ENDPOINT = LMS_SETUP_ENDPOINT + LMS_SETUP_TEST_PATH_SEGMENT; public static final String USER_ACCOUNT_ENDPOINT = "/useraccount"; 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 757836d8..183bb017 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-03-07T15:53:05.623+01:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-03-11T09:59:52.453+01:00") public enum EntityType { CONFIGURATION_ATTRIBUTE, CONFIGURATION_VALUE, @@ -16,7 +16,7 @@ public enum EntityType { INDICATOR, THRESHOLD, INSTITUTION, - SEB_CLIENT_CREDENTIALS, + SEB_CLIENT_CONFIGURATION, 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 c06fa42c..22d3a41b 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-03-07T15:53:05.523+01:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-03-11T09:59:52.395+01:00") public interface Domain { interface CONFIGURATION_ATTRIBUTE { @@ -148,9 +148,9 @@ public interface Domain { String ATTR_LOGO_IMAGE = "logoImage"; } - interface SEB_CLIENT_CREDENTIALS { - String TYPE_NAME = "SebClientCredentials"; - String REFERENCE_NAME = "sebClientCredentialss"; + interface SEB_CLIENT_CONFIGURATION { + String TYPE_NAME = "SebClientConfiguration"; + String REFERENCE_NAME = "sebClientConfigurations"; String ATTR_ID = "id"; String ATTR_INSTITUTION_ID = "institutionId"; String ATTR_NAME = "name"; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/SebClientConfig.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/SebClientConfig.java new file mode 100644 index 00000000..48ee77d7 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/institution/SebClientConfig.java @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.gbl.model.institution; + +import javax.validation.constraints.NotNull; + +import org.joda.time.DateTime; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.Activatable; +import ch.ethz.seb.sebserver.gbl.model.Domain.SEB_CLIENT_CONFIGURATION; +import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.GrantEntity; + +public final class SebClientConfig implements GrantEntity, Activatable { + + public static final String FILTER_ATTR_FROM = "from"; + + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ID) + public final Long id; + + @NotNull + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_INSTITUTION_ID) + public final Long institutionId; + + @NotNull + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_NAME) + public final String name; + + @NotNull + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_DATE) + public final DateTime date; + + @NotNull + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ACTIVE) + public final Boolean active; + + public SebClientConfig( + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ID) final Long id, + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_INSTITUTION_ID) final Long institutionId, + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_NAME) final String name, + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_DATE) final DateTime date, + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ACTIVE) final Boolean active) { + + this.id = id; + this.institutionId = institutionId; + this.name = name; + this.date = date; + this.active = active; + } + + @Override + public EntityType entityType() { + return EntityType.SEB_CLIENT_CONFIGURATION; + } + + @Override + public String getName() { + return this.name; + } + + @Override + public String getModelId() { + return (this.id != null) + ? String.valueOf(this.id) + : null; + } + + @Override + public boolean isActive() { + return this.active; + } + + @Override + public Long getInstitutionId() { + return this.institutionId; + } + + @Override + public String getOwnerId() { + return null; + } + + public Long getId() { + return this.id; + } + + public DateTime getDate() { + return this.date; + } + + public Boolean getActive() { + return this.active; + } + + @Override + public String toString() { + return "SEBClientConfig [id=" + this.id + ", institutionId=" + this.institutionId + ", name=" + this.name + + ", date=" + this.date + + ", active=" + this.active + "]"; + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java index cfd57be6..06e2625a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java @@ -254,6 +254,14 @@ public final class Result { } } + public static Result tryCatchOf(final Supplier> supplier) { + try { + return supplier.get(); + } catch (final Exception e) { + return Result.ofError(e); + } + } + public static Stream skipOnError(final Result result) { if (result.error != null) { return Stream.empty(); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionForm.java index 67afa25e..fbff4c4d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionForm.java @@ -8,6 +8,8 @@ package ch.ethz.seb.sebserver.gui.content; +import org.eclipse.rap.rwt.RWT; +import org.eclipse.rap.rwt.client.service.UrlLauncher; import org.eclipse.swt.widgets.Composite; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,6 +18,7 @@ import org.springframework.stereotype.Component; import ch.ethz.seb.sebserver.gbl.api.API; import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.authorization.PrivilegeType; import ch.ethz.seb.sebserver.gbl.model.Domain; import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.institution.Institution; @@ -29,6 +32,7 @@ import ch.ethz.seb.sebserver.gui.service.page.PageContext; import ch.ethz.seb.sebserver.gui.service.page.PageUtils; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.page.action.Action; +import ch.ethz.seb.sebserver.gui.service.remote.SebClientConfigDownload; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.GetInstitution; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.NewInstitution; @@ -47,15 +51,18 @@ public class InstitutionForm implements TemplateComposer { private final PageFormService pageFormService; private final RestService restService; private final CurrentUser currentUser; + private final SebClientConfigDownload sebClientConfigDownload; protected InstitutionForm( final PageFormService pageFormService, final RestService restService, - final CurrentUser currentUser) { + final CurrentUser currentUser, + final SebClientConfigDownload sebClientConfigDownload) { this.pageFormService = pageFormService; this.restService = restService; this.currentUser = currentUser; + this.sebClientConfigDownload = sebClientConfigDownload; } @Override @@ -84,6 +91,9 @@ public class InstitutionForm implements TemplateComposer { final boolean writeGrant = instGrant.w(); final boolean modifyGrant = instGrant.m(); final boolean userWriteGrant = this.currentUser.grantCheck(EntityType.USER).w(); + final boolean sebConfigWriteGrant = this.currentUser.hasInstitutionalPrivilege( + PrivilegeType.WRITE, + EntityType.SEB_CLIENT_CONFIGURATION); final boolean isReadonly = pageContext.isReadonly(); // new PageContext with actual EntityKey @@ -128,6 +138,7 @@ public class InstitutionForm implements TemplateComposer { : this.restService.getRestCall(SaveInstitution.class)); // propagate content actions to action-pane + final UrlLauncher urlLauncher = RWT.getClient().getService(UrlLauncher.class); formContext.clearEntityKeys() .createAction(ActionDefinition.INSTITUTION_NEW) @@ -141,6 +152,16 @@ public class InstitutionForm implements TemplateComposer { .withEntityKey(entityKey) .publishIf(() -> modifyGrant && isReadonly) + .createAction(ActionDefinition.INSTITUTION_EXPORT_SEB_CONFIG) + .withEntityKey(entityKey) + .withExec(action -> { + final String downloadURL = this.sebClientConfigDownload.downloadSEBClientConfigURL( + entityKey.modelId); + urlLauncher.openURL(downloadURL); + return action; + }) + .publishIf(() -> sebConfigWriteGrant && isReadonly && institution.isActive()) + .createAction(ActionDefinition.INSTITUTION_DEACTIVATE) .withEntityKey(entityKey) .withExec(this.restService::activation) 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 c27ecdfc..85aa784b 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 @@ -10,8 +10,6 @@ package ch.ethz.seb.sebserver.gui.content; import java.util.function.BooleanSupplier; -import org.eclipse.rap.rwt.RWT; -import org.eclipse.rap.rwt.client.service.UrlLauncher; import org.eclipse.swt.widgets.Composite; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +34,6 @@ import ch.ethz.seb.sebserver.gui.service.page.PageContext; import ch.ethz.seb.sebserver.gui.service.page.PageUtils; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.page.action.Action; -import ch.ethz.seb.sebserver.gui.service.remote.SebClientConfigDownload; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.GetInstitution; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.lmssetup.GetLmsSetup; @@ -55,16 +52,13 @@ public class LmsSetupForm implements TemplateComposer { private final PageFormService pageFormService; private final ResourceService resourceService; - private final SebClientConfigDownload sebClientConfigDownload; protected LmsSetupForm( final PageFormService pageFormService, - final ResourceService resourceService, - final SebClientConfigDownload sebClientConfigDownload) { + final ResourceService resourceService) { this.pageFormService = pageFormService; this.resourceService = resourceService; - this.sebClientConfigDownload = sebClientConfigDownload; } @Override @@ -173,7 +167,6 @@ public class LmsSetupForm implements TemplateComposer { ; // propagate content actions to action-pane - final UrlLauncher urlLauncher = RWT.getClient().getService(UrlLauncher.class); formContext.clearEntityKeys() .createAction(ActionDefinition.LMS_SETUP_NEW) @@ -183,16 +176,6 @@ public class LmsSetupForm implements TemplateComposer { .withEntityKey(entityKey) .publishIf(() -> modifyGrant && readonly && istitutionActive) - .createAction(ActionDefinition.LMS_SETUP_EXPORT_SEB_CONFIG) - .withEntityKey(entityKey) - .withExec(action -> { - final String downloadURL = this.sebClientConfigDownload.downloadSEBClientConfigURL( - entityKey.modelId); - urlLauncher.openURL(downloadURL); - return action; - }) - .publishIf(() -> writeGrant && readonly && lmsSetup.isActive()) - .createAction(ActionDefinition.LMS_SETUP_DEACTIVATE) .withEntityKey(entityKey) .withExec(restService::activation) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java index b689c38a..4bb34ff6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java @@ -84,6 +84,11 @@ public enum ActionDefinition { ImageIcon.DELETE, InstitutionList.class, INSTITUTION_VIEW_LIST), + INSTITUTION_EXPORT_SEB_CONFIG( + new LocTextKey("sebserver.institution.action.export.sebconfig"), + ImageIcon.SAVE, + InstitutionForm.class, + INSTITUTION_VIEW_LIST), USER_ACCOUNT_VIEW_LIST( new LocTextKey("sebserver.useraccount.action.list"), @@ -177,11 +182,6 @@ public enum ActionDefinition { ImageIcon.EDIT, LmsSetupForm.class, LMS_SETUP_VIEW_LIST, false), - LMS_SETUP_EXPORT_SEB_CONFIG( - new LocTextKey("sebserver.lmssetup.action.export.sebconfig"), - ImageIcon.SAVE, - LmsSetupForm.class, - LMS_SETUP_VIEW_LIST), LMS_SETUP_CANCEL_MODIFY( new LocTextKey("sebserver.overall.action.modify.cancel"), ImageIcon.CANCEL, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/SebClientConfigDownload.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/SebClientConfigDownload.java index 1bf0edfd..1da8bb78 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/SebClientConfigDownload.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/SebClientConfigDownload.java @@ -24,7 +24,7 @@ import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.api.API; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; -import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.lmssetup.ExportSEBConfig; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.ExportSEBConfig; @Lazy @Component @@ -53,9 +53,10 @@ public class SebClientConfigDownload implements DownloadServiceHandler { log.debug("download requested... trying to get needed parameter from request"); - final String modelId = request.getParameter(API.PARAM_MODEL_ID); + final String modelId = request.getParameter(API.PARAM_INSTITUTION_ID); if (StringUtils.isBlank(modelId)) { - log.error("No needed modelId parameter found within HttpServletRequest. Download request is ignored"); + log.error( + "Mandatory modelId parameter not found within HttpServletRequest. Download request is ignored"); return; } @@ -63,7 +64,7 @@ public class SebClientConfigDownload implements DownloadServiceHandler { SEB_CLIENT_CONFIG_FILE_NAME); final byte[] configFile = this.restService.getBuilder(ExportSEBConfig.class) - .withURIVariable(API.PARAM_MODEL_ID, modelId) + .withURIVariable(API.PARAM_INSTITUTION_ID, modelId) .call() .getOrThrow(); @@ -96,7 +97,7 @@ public class SebClientConfigDownload implements DownloadServiceHandler { .append(RWT.getServiceManager() .getServiceHandlerUrl(DownloadService.DOWNLOAD_SERVICE_NAME)) .append(Constants.FORM_URL_ENCODED_SEPARATOR) - .append(API.PARAM_MODEL_ID) + .append(API.PARAM_INSTITUTION_ID) .append(Constants.FORM_URL_ENCODED_NAME_VALUE_SEPARATOR) .append(modelId) .append(Constants.FORM_URL_ENCODED_SEPARATOR) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/lmssetup/ExportSEBConfig.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/institution/ExportSEBConfig.java similarity index 93% rename from src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/lmssetup/ExportSEBConfig.java rename to src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/institution/ExportSEBConfig.java index 50c41648..c723f7ac 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/lmssetup/ExportSEBConfig.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/institution/ExportSEBConfig.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.lmssetup; +package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpMethod; @@ -33,7 +33,7 @@ public class ExportSEBConfig extends RestCall { }, HttpMethod.GET, MediaType.APPLICATION_FORM_URLENCODED, - API.SEB_CONFIG_EXPORT_ENDPOINT + API.MODEL_ID_VAR_PATH_SEGMENT); + API.SEB_CONFIG_EXPORT_ENDPOINT); } @Override 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 397e535a..6c5e5751 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-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source Table: additional_attributes") public static final AdditionalAttributes additionalAttributes = new AdditionalAttributes(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source field: additional_attributes.id") public static final SqlColumn id = additionalAttributes.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+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-03-07T15:53:05.854+01:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.854+01:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+01:00", comments="Source field: additional_attributes.name") public static final SqlColumn name = additionalAttributes.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+01:00", comments="Source field: additional_attributes.value") public static final SqlColumn value = additionalAttributes.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+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 df084b51..1182673a 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-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.854+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.731+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.732+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.732+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-03-07T15:53:05.855+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.732+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 d02c0ee1..d79f68e4 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-03-07T15:53:05.791+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.679+01:00", comments="Source Table: client_connection") public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.679+01:00", comments="Source field: client_connection.id") public static final SqlColumn id = clientConnectionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.679+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-03-07T15:53:05.792+01:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.680+01:00", comments="Source field: client_connection.status") public static final SqlColumn status = clientConnectionRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.680+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-03-07T15:53:05.792+01:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.680+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-03-07T15:53:05.792+01:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.680+01:00", comments="Source field: client_connection.vdi") public static final SqlColumn vdi = clientConnectionRecord.vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.792+01:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.680+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-03-07T15:53:05.792+01:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.680+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-03-07T15:53:05.791+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.679+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 ff1d9add..9ccc5166 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-03-07T15:53:05.792+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.680+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.680+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.680+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.680+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.793+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.794+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.681+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-03-07T15:53:05.794+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.682+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-03-07T15:53:05.794+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.682+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 2cf366c6..fd73a022 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-03-07T15:53:05.797+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.685+01:00", comments="Source Table: client_event") public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.798+01:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.685+01:00", comments="Source field: client_event.id") public static final SqlColumn id = clientEventRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.798+01:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.685+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-03-07T15:53:05.798+01:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.685+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-03-07T15:53:05.798+01:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.685+01:00", comments="Source field: client_event.type") public static final SqlColumn type = clientEventRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.798+01:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.685+01:00", comments="Source field: client_event.timestamp") public static final SqlColumn timestamp = clientEventRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.799+01:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.799+01:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+01:00", comments="Source field: client_event.text") public static final SqlColumn text = clientEventRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.798+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.685+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 56c4567c..8aa664be 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-03-07T15:53:05.799+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.799+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.799+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.799+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.799+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.799+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.799+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.799+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.800+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.800+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.800+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.800+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.800+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.686+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-03-07T15:53:05.800+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.687+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-03-07T15:53:05.800+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.687+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-03-07T15:53:05.800+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.687+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-03-07T15:53:05.803+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.687+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-03-07T15:53:05.803+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.687+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 322d68a8..744aa202 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-03-07T15:53:05.448+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.343+01:00", comments="Source Table: configuration_attribute") public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.452+01:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.346+01:00", comments="Source field: configuration_attribute.id") public static final SqlColumn id = configurationAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.453+01:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.347+01:00", comments="Source field: configuration_attribute.name") public static final SqlColumn name = configurationAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.453+01:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.347+01:00", comments="Source field: configuration_attribute.type") public static final SqlColumn type = configurationAttributeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.454+01:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.348+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-03-07T15:53:05.454+01:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.348+01:00", comments="Source field: configuration_attribute.resources") public static final SqlColumn resources = configurationAttributeRecord.resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.455+01:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.349+01:00", comments="Source field: configuration_attribute.validator") public static final SqlColumn validator = configurationAttributeRecord.validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.456+01:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.349+01:00", comments="Source field: configuration_attribute.dependencies") public static final SqlColumn dependencies = configurationAttributeRecord.dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.456+01:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.350+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-03-07T15:53:05.451+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.346+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 3ae0c94c..238fabe2 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-03-07T15:53:05.458+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.351+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-03-07T15:53:05.460+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.353+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-03-07T15:53:05.461+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.355+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-03-07T15:53:05.474+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.358+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-03-07T15:53:05.481+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.362+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-03-07T15:53:05.484+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.363+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-03-07T15:53:05.486+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.364+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-03-07T15:53:05.487+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.365+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-03-07T15:53:05.488+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.366+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-03-07T15:53:05.490+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.367+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-03-07T15:53:05.493+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.369+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-03-07T15:53:05.496+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.372+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-03-07T15:53:05.499+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.375+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-03-07T15:53:05.500+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.376+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-03-07T15:53:05.501+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.377+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-03-07T15:53:05.502+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.379+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-03-07T15:53:05.504+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.380+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-03-07T15:53:05.505+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.381+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 223b918c..0c77b624 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-03-07T15:53:05.773+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.640+01:00", comments="Source Table: configuration_node") public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.774+01:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.640+01:00", comments="Source field: configuration_node.id") public static final SqlColumn id = configurationNodeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.774+01:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.640+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-03-07T15:53:05.774+01:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.640+01:00", comments="Source field: configuration_node.owner") public static final SqlColumn owner = configurationNodeRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.774+01:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.641+01:00", comments="Source field: configuration_node.name") public static final SqlColumn name = configurationNodeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.774+01:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.641+01:00", comments="Source field: configuration_node.description") public static final SqlColumn description = configurationNodeRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.775+01:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.641+01:00", comments="Source field: configuration_node.type") public static final SqlColumn type = configurationNodeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.775+01:00", comments="Source field: configuration_node.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.641+01:00", comments="Source field: configuration_node.template") public static final SqlColumn template = configurationNodeRecord.template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.775+01:00", comments="Source field: configuration_node.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.641+01:00", comments="Source field: configuration_node.active") public static final SqlColumn active = configurationNodeRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.640+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 8a3428ee..d2a13ee3 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-03-07T15:53:05.775+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.641+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-03-07T15:53:05.775+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.641+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-03-07T15:53:05.775+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.641+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-03-07T15:53:05.775+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.641+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-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.642+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-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.642+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-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.642+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-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.642+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-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.642+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-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.642+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-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.642+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-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.642+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-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.642+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-03-07T15:53:05.776+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.642+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-03-07T15:53:05.777+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.643+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-03-07T15:53:05.777+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.643+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-03-07T15:53:05.777+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.647+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-03-07T15:53:05.777+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.647+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 d6c3e593..aa781602 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-03-07T15:53:05.766+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.631+01:00", comments="Source Table: configuration") public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.767+01:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.633+01:00", comments="Source field: configuration.id") public static final SqlColumn id = configurationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.767+01:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.633+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-03-07T15:53:05.767+01:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.633+01:00", comments="Source field: configuration.version") public static final SqlColumn version = configurationRecord.version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.768+01:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.633+01:00", comments="Source field: configuration.version_date") public static final SqlColumn versionDate = configurationRecord.versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.768+01:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.633+01:00", comments="Source field: configuration.followup") public static final SqlColumn followup = configurationRecord.followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.767+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.632+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 3a707d01..32c753d4 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-03-07T15:53:05.768+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.633+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-03-07T15:53:05.768+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.633+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-03-07T15:53:05.768+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.768+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.768+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.769+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.769+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.769+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+01:00", comments="Source Table: configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.769+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.769+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.769+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.769+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.769+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.769+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.634+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-03-07T15:53:05.769+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.635+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-03-07T15:53:05.770+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.635+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-03-07T15:53:05.770+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.635+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-03-07T15:53:05.770+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.635+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 1821aadc..69534026 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-03-07T15:53:05.747+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.608+01:00", comments="Source Table: configuration_value") public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.747+01:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.609+01:00", comments="Source field: configuration_value.id") public static final SqlColumn id = configurationValueRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.747+01:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.609+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-03-07T15:53:05.747+01:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.609+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-03-07T15:53:05.747+01:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.609+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-03-07T15:53:05.748+01:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.609+01:00", comments="Source field: configuration_value.value") public static final SqlColumn value = configurationValueRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.748+01:00", comments="Source field: configuration_value.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.610+01:00", comments="Source field: configuration_value.text") public static final SqlColumn text = configurationValueRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.747+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.608+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 310dc193..4e9508dc 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-03-07T15:53:05.748+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.610+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-03-07T15:53:05.748+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.610+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-03-07T15:53:05.748+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.610+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-03-07T15:53:05.748+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.611+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-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.611+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-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.611+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-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.611+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-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.611+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-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.611+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-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.611+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-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.611+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-03-07T15:53:05.749+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.612+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-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.612+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-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.612+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-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.612+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-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.612+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-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.612+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-03-07T15:53:05.750+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.613+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 141308b7..a5456603 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-03-07T15:53:05.779+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.649+01:00", comments="Source Table: exam_configuration_map") public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.780+01:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.650+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-03-07T15:53:05.780+01:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.650+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-03-07T15:53:05.781+01:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.650+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-03-07T15:53:05.781+01:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.651+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-03-07T15:53:05.780+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.649+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 7f227192..dff51895 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-03-07T15:53:05.781+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.651+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-03-07T15:53:05.781+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.652+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-03-07T15:53:05.781+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.652+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-03-07T15:53:05.781+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.652+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.652+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.653+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.653+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.653+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.653+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.653+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.654+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.654+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.654+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.656+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.656+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.657+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-03-07T15:53:05.782+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.657+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-03-07T15:53:05.783+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.657+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 56d76dde..2b0e322b 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-03-07T15:53:05.786+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.673+01:00", comments="Source Table: exam") public static final ExamRecord examRecord = new ExamRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.674+01:00", comments="Source field: exam.id") public static final SqlColumn id = examRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.674+01:00", comments="Source field: exam.institution_id") public static final SqlColumn institutionId = examRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.674+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-03-07T15:53:05.787+01:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.674+01:00", comments="Source field: exam.external_id") public static final SqlColumn externalId = examRecord.externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.675+01:00", comments="Source field: exam.owner") public static final SqlColumn owner = examRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.675+01:00", comments="Source field: exam.supporter") public static final SqlColumn supporter = examRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.675+01:00", comments="Source field: exam.type") public static final SqlColumn type = examRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.675+01:00", comments="Source field: exam.status") public static final SqlColumn status = examRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.787+01:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.675+01:00", comments="Source field: exam.quit_password") public static final SqlColumn quitPassword = examRecord.quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.675+01:00", comments="Source field: exam.active") public static final SqlColumn active = examRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.673+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 04247770..d2fed519 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-03-07T15:53:05.788+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.675+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-03-07T15:53:05.788+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.788+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.788+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.788+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.788+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.788+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.788+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+01:00", comments="Source Table: exam") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.788+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.788+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.789+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.789+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.789+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.789+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.789+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.676+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-03-07T15:53:05.789+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.677+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-03-07T15:53:05.789+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.677+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-03-07T15:53:05.789+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.677+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 e698be82..5b68419d 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-03-07T15:53:05.808+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.691+01:00", comments="Source Table: indicator") public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.691+01:00", comments="Source field: indicator.id") public static final SqlColumn id = indicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.691+01:00", comments="Source field: indicator.exam_id") public static final SqlColumn examId = indicatorRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.691+01:00", comments="Source field: indicator.type") public static final SqlColumn type = indicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.691+01:00", comments="Source field: indicator.name") public static final SqlColumn name = indicatorRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.691+01:00", comments="Source field: indicator.color") public static final SqlColumn color = indicatorRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.809+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.691+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 1102bfec..7a273365 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-03-07T15:53:05.809+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.691+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+01:00", comments="Source Table: indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.810+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.811+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.811+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.811+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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-03-07T15:53:05.811+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.692+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 455b4428..2de9eeb5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class InstitutionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source Table: institution") public static final InstitutionRecord institutionRecord = new InstitutionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.id") public static final SqlColumn id = institutionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.699+01:00", comments="Source field: institution.name") public static final SqlColumn name = institutionRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.699+01:00", comments="Source field: institution.url_suffix") public static final SqlColumn urlSuffix = institutionRecord.urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.699+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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.699+01:00", comments="Source field: institution.active") public static final SqlColumn active = institutionRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.699+01:00", comments="Source field: institution.logo_image") public static final SqlColumn logoImage = institutionRecord.logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.818+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source Table: institution") public static final class InstitutionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java index 5d7119f6..f638f63d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface InstitutionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.699+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-03-07T15:53:05.819+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.699+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-03-07T15:53:05.819+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.699+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-03-07T15:53:05.819+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.699+01:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface InstitutionRecordMapper { }) InstitutionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.699+01:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface InstitutionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+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-03-07T15:53:05.819+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+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-03-07T15:53:05.819+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.819+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default int insert(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -105,7 +105,7 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default int insertSelective(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -118,19 +118,19 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default InstitutionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord) @@ -139,7 +139,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default UpdateDSL> updateByExample(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -149,7 +149,7 @@ public interface InstitutionRecordMapper { .set(logoImage).equalTo(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default UpdateDSL> updateByExampleSelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) @@ -159,7 +159,7 @@ public interface InstitutionRecordMapper { .set(logoImage).equalToWhenPresent(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default int updateByPrimaryKey(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -172,7 +172,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.820+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.700+01:00", comments="Source Table: institution") default int updateByPrimaryKeySelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java index 1dcb4637..236f7da5 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,37 +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-03-07T15:53:05.830+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.710+01:00", comments="Source Table: lms_setup") public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.830+01:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.710+01:00", comments="Source field: lms_setup.id") public static final SqlColumn id = lmsSetupRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.830+01:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.710+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-03-07T15:53:05.830+01:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.710+01:00", comments="Source field: lms_setup.name") public static final SqlColumn name = lmsSetupRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.710+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-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.710+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-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.710+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-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+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-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+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-03-07T15:53:05.831+01:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+01:00", comments="Source field: lms_setup.active") public static final SqlColumn active = lmsSetupRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.830+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.710+01:00", comments="Source Table: lms_setup") public static final class LmsSetupRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java index c95f27d4..c5d191bc 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-03-07T15:53:05.831+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+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-03-07T15:53:05.831+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+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-03-07T15:53:05.831+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+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-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+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), @@ -60,7 +60,7 @@ public interface LmsSetupRecordMapper { }) LmsSetupRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+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), @@ -75,22 +75,22 @@ public interface LmsSetupRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+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-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+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-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+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-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+01:00", comments="Source Table: lms_setup") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+01:00", comments="Source Table: lms_setup") default int insert(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -114,7 +114,7 @@ public interface LmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+01:00", comments="Source Table: lms_setup") default int insertSelective(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -130,19 +130,19 @@ public interface LmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.711+01:00", comments="Source Table: lms_setup") default QueryExpressionDSL>> selectByExample() { 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-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.712+01:00", comments="Source Table: lms_setup") default QueryExpressionDSL>> selectDistinctByExample() { 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-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.712+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, active) .from(lmsSetupRecord) @@ -151,7 +151,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.832+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.712+01:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExample(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -164,7 +164,7 @@ public interface LmsSetupRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.833+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.712+01:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExampleSelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -177,7 +177,7 @@ public interface LmsSetupRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.833+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.712+01:00", comments="Source Table: lms_setup") default int updateByPrimaryKey(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -193,7 +193,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.833+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.712+01:00", comments="Source Table: lms_setup") default int updateByPrimaryKeySelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java index e1e150da..76633849 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-03-07T15:53:05.754+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.617+01:00", comments="Source Table: orientation") public static final OrientationRecord orientationRecord = new OrientationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.754+01:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.618+01:00", comments="Source field: orientation.id") public static final SqlColumn id = orientationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.754+01:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.618+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-03-07T15:53:05.754+01:00", comments="Source field: orientation.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.618+01:00", comments="Source field: orientation.template") public static final SqlColumn template = orientationRecord.template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.755+01:00", comments="Source field: orientation.view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.619+01:00", comments="Source field: orientation.view") public static final SqlColumn view = orientationRecord.view; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.755+01:00", comments="Source field: orientation.group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.619+01:00", comments="Source field: orientation.group") public static final SqlColumn group = orientationRecord.group; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.755+01:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.619+01:00", comments="Source field: orientation.x_position") public static final SqlColumn xPosition = orientationRecord.xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.755+01:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.619+01:00", comments="Source field: orientation.y_position") public static final SqlColumn yPosition = orientationRecord.yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.755+01:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.620+01:00", comments="Source field: orientation.width") public static final SqlColumn width = orientationRecord.width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.756+01:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.620+01:00", comments="Source field: orientation.height") public static final SqlColumn height = orientationRecord.height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.754+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.617+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 25fcaac9..74824e10 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-03-07T15:53:05.756+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.621+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-03-07T15:53:05.756+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.622+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-03-07T15:53:05.756+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.622+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-03-07T15:53:05.756+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.622+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-03-07T15:53:05.756+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.623+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-03-07T15:53:05.756+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.624+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-03-07T15:53:05.756+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.624+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-03-07T15:53:05.757+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.624+01:00", comments="Source Table: orientation") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.757+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.624+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-03-07T15:53:05.757+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.624+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-03-07T15:53:05.757+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.624+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-03-07T15:53:05.762+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.625+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-03-07T15:53:05.763+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.625+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-03-07T15:53:05.763+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.625+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-03-07T15:53:05.763+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.625+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-03-07T15:53:05.763+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.625+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-03-07T15:53:05.764+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.625+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-03-07T15:53:05.764+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.625+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 001a06a8..5c00cc39 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-03-07T15:53:05.840+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.719+01:00", comments="Source Table: user_role") public static final RoleRecord roleRecord = new RoleRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.719+01:00", comments="Source field: user_role.id") public static final SqlColumn id = roleRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.720+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-03-07T15:53:05.840+01:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.720+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-03-07T15:53:05.840+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.719+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 fa172142..84dc0127 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-03-07T15:53:05.840+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.720+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-03-07T15:53:05.840+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.720+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-03-07T15:53:05.840+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.720+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.720+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.720+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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-03-07T15:53:05.841+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.725+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/SebClientConfigRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java new file mode 100644 index 00000000..19be1a4f --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java @@ -0,0 +1,54 @@ +package ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper; + +import java.sql.JDBCType; +import javax.annotation.Generated; +import org.joda.time.DateTime; +import org.mybatis.dynamic.sql.SqlColumn; +import org.mybatis.dynamic.sql.SqlTable; + +public final class SebClientConfigRecordDynamicSqlSupport { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.703+01:00", comments="Source Table: seb_client_configuration") + public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord(); + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.703+01:00", comments="Source field: seb_client_configuration.id") + public static final SqlColumn id = sebClientConfigRecord.id; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.703+01:00", comments="Source field: seb_client_configuration.institution_id") + public static final SqlColumn institutionId = sebClientConfigRecord.institutionId; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.704+01:00", comments="Source field: seb_client_configuration.name") + public static final SqlColumn name = sebClientConfigRecord.name; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.704+01:00", comments="Source field: seb_client_configuration.date") + public static final SqlColumn date = sebClientConfigRecord.date; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.704+01:00", comments="Source field: seb_client_configuration.client_name") + public static final SqlColumn clientName = sebClientConfigRecord.clientName; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.704+01:00", comments="Source field: seb_client_configuration.client_secret") + public static final SqlColumn clientSecret = sebClientConfigRecord.clientSecret; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.705+01:00", comments="Source field: seb_client_configuration.active") + public static final SqlColumn active = sebClientConfigRecord.active; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.703+01:00", comments="Source Table: seb_client_configuration") + public static final class SebClientConfigRecord 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, "ch.ethz.seb.sebserver.webservice.datalayer.batis.JodaTimeTypeResolver"); + + 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 SebClientConfigRecord() { + super("seb_client_configuration"); + } + } +} \ 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/SebClientConfigRecordMapper.java similarity index 72% rename from src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientCredentialsRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java index da57b493..1b1949bf 100644 --- 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/SebClientConfigRecordMapper.java @@ -1,10 +1,10 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper; -import static ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.SebClientCredentialsRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.SebClientConfigRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.SebClientCredentialsRecord; -import java.util.Date; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.JodaTimeTypeResolver; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.SebClientConfigRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -16,6 +16,7 @@ import org.apache.ibatis.annotations.SelectKey; import org.apache.ibatis.annotations.SelectProvider; import org.apache.ibatis.annotations.UpdateProvider; import org.apache.ibatis.type.JdbcType; +import org.joda.time.DateTime; import org.mybatis.dynamic.sql.SqlBuilder; import org.mybatis.dynamic.sql.delete.DeleteDSL; import org.mybatis.dynamic.sql.delete.MyBatis3DeleteModelAdapter; @@ -32,73 +33,73 @@ 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") +public interface SebClientConfigRecordMapper { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.705+01:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source Table: seb_client_credentials") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.705+01:00", comments="Source Table: seb_client_configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.824+01:00", comments="Source Table: seb_client_credentials") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.705+01:00", comments="Source Table: seb_client_configuration") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) - int insert(InsertStatementProvider insertStatement); + 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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.705+01:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @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="date", javaType=DateTime.class, typeHandler=JodaTimeTypeResolver.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); + SebClientConfigRecord 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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.705+01:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @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="date", javaType=DateTime.class, typeHandler=JodaTimeTypeResolver.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); + 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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.705+01:00", comments="Source Table: seb_client_configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.705+01:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) - .from(sebClientCredentialsRecord); + .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") default DeleteDSL> deleteByExample() { - return DeleteDSL.deleteFromWithMapper(this::delete, sebClientCredentialsRecord); + return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.825+01:00", comments="Source Table: seb_client_credentials") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") default int deleteByPrimaryKey(Long id_) { - return DeleteDSL.deleteFromWithMapper(this::delete, sebClientCredentialsRecord) + return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord) .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) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") + default int insert(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) - .into(sebClientCredentialsRecord) + .into(sebClientConfigRecord) .map(institutionId).toProperty("institutionId") .map(name).toProperty("name") .map(date).toProperty("date") @@ -109,10 +110,10 @@ public interface SebClientCredentialsRecordMapper { .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) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") + default int insertSelective(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) - .into(sebClientCredentialsRecord) + .into(sebClientConfigRecord) .map(institutionId).toPropertyWhenPresent("institutionId", record::getInstitutionId) .map(name).toPropertyWhenPresent("name", record::getName) .map(date).toPropertyWhenPresent("date", record::getDate) @@ -123,30 +124,30 @@ public interface SebClientCredentialsRecordMapper { .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() { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") + default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, active) - .from(sebClientCredentialsRecord); + .from(sebClientConfigRecord); } - @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() { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") + default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, active) - .from(sebClientCredentialsRecord); + .from(sebClientConfigRecord); } - @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_) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") + default SebClientConfigRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, active) - .from(sebClientCredentialsRecord) + .from(sebClientConfigRecord) .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) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") + default UpdateDSL> updateByExample(SebClientConfigRecord record) { + return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) .set(name).equalTo(record::getName) .set(date).equalTo(record::getDate) @@ -155,9 +156,9 @@ public interface SebClientCredentialsRecordMapper { .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) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") + default UpdateDSL> updateByExampleSelective(SebClientConfigRecord record) { + return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(name).equalToWhenPresent(record::getName) .set(date).equalToWhenPresent(record::getDate) @@ -166,9 +167,9 @@ public interface SebClientCredentialsRecordMapper { .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) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") + default int updateByPrimaryKey(SebClientConfigRecord record) { + return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) .set(name).equalTo(record::getName) .set(date).equalTo(record::getDate) @@ -180,9 +181,9 @@ public interface SebClientCredentialsRecordMapper { .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) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.706+01:00", comments="Source Table: seb_client_configuration") + default int updateByPrimaryKeySelective(SebClientConfigRecord record) { + return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(name).equalToWhenPresent(record::getName) .set(date).equalToWhenPresent(record::getDate) @@ -201,6 +202,6 @@ public interface SebClientCredentialsRecordMapper { default QueryExpressionDSL>> selectIdsByExample() { return SelectDSL.selectDistinctWithMapper(this::selectIds, id) - .from(sebClientCredentialsRecord); + .from(sebClientConfigRecord); } } \ No newline at end of file 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 deleted file mode 100644 index b5672a16..00000000 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientCredentialsRecordDynamicSqlSupport.java +++ /dev/null @@ -1,54 +0,0 @@ -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/ThresholdRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java index ee24963b..45e8ee74 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-03-07T15:53:05.815+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.694+01:00", comments="Source Table: threshold") public static final ThresholdRecord thresholdRecord = new ThresholdRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.694+01:00", comments="Source field: threshold.id") public static final SqlColumn id = thresholdRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+01:00", comments="Source field: threshold.indicator_id") public static final SqlColumn indicatorId = thresholdRecord.indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+01:00", comments="Source field: threshold.value") public static final SqlColumn value = thresholdRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+01:00", comments="Source field: threshold.color") public static final SqlColumn color = thresholdRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.815+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.694+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 f1a12723..e13866a0 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-03-07T15:53:05.815+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.815+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.815+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+01:00", comments="Source Table: threshold") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.695+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.696+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.696+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.696+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.696+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.696+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-03-07T15:53:05.816+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.696+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 a79efccc..f3c3fba5 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-03-07T15:53:05.843+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+01:00", comments="Source Table: user_activity_log") public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+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-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+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-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+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-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+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-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+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-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+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-03-07T15:53:05.843+01:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+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-03-07T15:53:05.843+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+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 139cf41d..3a97e9fd 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-03-07T15:53:05.843+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.843+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.843+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.844+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.844+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.844+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.844+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.844+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.844+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.844+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.844+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.850+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.728+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-03-07T15:53:05.850+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.729+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-03-07T15:53:05.850+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.729+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-03-07T15:53:05.850+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.729+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-03-07T15:53:05.851+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.729+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-03-07T15:53:05.852+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.729+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-03-07T15:53:05.852+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.729+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 4fcaf854..f3065361 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-03-07T15:53:05.835+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source Table: user") public static final UserRecord userRecord = new UserRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.id") public static final SqlColumn id = userRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.institution_id") public static final SqlColumn institutionId = userRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.uuid") public static final SqlColumn uuid = userRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.name") public static final SqlColumn name = userRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.836+01:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.username") public static final SqlColumn username = userRecord.username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.837+01:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.password") public static final SqlColumn password = userRecord.password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.837+01:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.email") public static final SqlColumn email = userRecord.email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.837+01:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.language") public static final SqlColumn language = userRecord.language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.837+01:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.timezone") public static final SqlColumn timezone = userRecord.timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.837+01:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+01:00", comments="Source field: user.active") public static final SqlColumn active = userRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.835+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+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 29c85f9b..9c8ea936 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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+01:00", comments="Source Table: user") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.838+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.716+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-03-07T15:53:05.839+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.717+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-03-07T15:53:05.839+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.717+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 399d9b71..f592a7f0 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-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source field: additional_attributes.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source field: additional_attributes.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source field: additional_attributes.entity_id") private Long entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source field: additional_attributes.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source field: additional_attributes.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+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-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source field: additional_attributes.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source field: additional_attributes.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source field: additional_attributes.entity_id") public Long getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+01:00", comments="Source field: additional_attributes.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.853+01:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.730+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 c5421b9d..65511046 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-03-07T15:53:05.790+01:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.677+01:00", comments="Source field: client_connection.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.677+01:00", comments="Source field: client_connection.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.678+01:00", comments="Source field: client_connection.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.678+01:00", comments="Source field: client_connection.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.678+01:00", comments="Source field: client_connection.user_name") private String userName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.679+01:00", comments="Source field: client_connection.vdi") private Boolean vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.679+01:00", comments="Source field: client_connection.client_address") private String clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.679+01:00", comments="Source field: client_connection.virtual_client_address") private String virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.677+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-03-07T15:53:05.790+01:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.677+01:00", comments="Source field: client_connection.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.678+01:00", comments="Source field: client_connection.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.678+01:00", comments="Source field: client_connection.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.790+01:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.678+01:00", comments="Source field: client_connection.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.678+01:00", comments="Source field: client_connection.user_name") public String getUserName() { return userName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.679+01:00", comments="Source field: client_connection.vdi") public Boolean getVdi() { return vdi; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.679+01:00", comments="Source field: client_connection.client_address") public String getClientAddress() { return clientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.791+01:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.679+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 ec01798f..c4832cab 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-03-07T15:53:05.795+01:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.683+01:00", comments="Source field: client_event.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.connection_id") private Long connectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.user_identifier") private String userIdentifier; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.796+01:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.numeric_value") private BigDecimal numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.797+01:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.683+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-03-07T15:53:05.795+01:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.683+01:00", comments="Source field: client_event.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.connection_id") public Long getConnectionId() { return connectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.user_identifier") public String getUserIdentifier() { return userIdentifier; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.795+01:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.796+01:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.796+01:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+01:00", comments="Source field: client_event.numeric_value") public BigDecimal getNumericValue() { return numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.797+01:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.684+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 46396ff0..3dece37f 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-03-07T15:53:05.425+01:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.332+01:00", comments="Source field: configuration_attribute.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.333+01:00", comments="Source field: configuration_attribute.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.334+01:00", comments="Source field: configuration_attribute.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.334+01:00", comments="Source field: configuration_attribute.parent_id") private Long parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.334+01:00", comments="Source field: configuration_attribute.resources") private String resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.428+01:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.334+01:00", comments="Source field: configuration_attribute.validator") private String validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.428+01:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.334+01:00", comments="Source field: configuration_attribute.dependencies") private String dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.429+01:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.335+01:00", comments="Source field: configuration_attribute.default_value") private String defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.417+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.327+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-03-07T15:53:05.426+01:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.333+01:00", comments="Source field: configuration_attribute.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.333+01:00", comments="Source field: configuration_attribute.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.334+01:00", comments="Source field: configuration_attribute.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.427+01:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.334+01:00", comments="Source field: configuration_attribute.parent_id") public Long getParentId() { return parentId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.428+01:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.334+01:00", comments="Source field: configuration_attribute.resources") public String getResources() { return resources; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.428+01:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.334+01:00", comments="Source field: configuration_attribute.validator") public String getValidator() { return validator; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.428+01:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.334+01:00", comments="Source field: configuration_attribute.dependencies") public String getDependencies() { return dependencies; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.429+01:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.335+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 f2c7f621..eaba1d51 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-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.638+01:00", comments="Source field: configuration_node.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.638+01:00", comments="Source field: configuration_node.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.638+01:00", comments="Source field: configuration_node.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+01:00", comments="Source field: configuration_node.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+01:00", comments="Source field: configuration_node.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+01:00", comments="Source field: configuration_node.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source field: configuration_node.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+01:00", comments="Source field: configuration_node.template") private String template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source field: configuration_node.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+01:00", comments="Source field: configuration_node.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.771+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.637+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-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.638+01:00", comments="Source field: configuration_node.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.638+01:00", comments="Source field: configuration_node.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+01:00", comments="Source field: configuration_node.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+01:00", comments="Source field: configuration_node.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.772+01:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+01:00", comments="Source field: configuration_node.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+01:00", comments="Source field: configuration_node.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source field: configuration_node.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+01:00", comments="Source field: configuration_node.template") public String getTemplate() { return template; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.773+01:00", comments="Source field: configuration_node.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.639+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 69f6a26c..6d695dc4 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-03-07T15:53:05.765+01:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.628+01:00", comments="Source field: configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.765+01:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.628+01:00", comments="Source field: configuration.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.630+01:00", comments="Source field: configuration.version") private String version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.631+01:00", comments="Source field: configuration.version_date") private DateTime versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.631+01:00", comments="Source field: configuration.followup") private Integer followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.765+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.628+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-03-07T15:53:05.765+01:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.628+01:00", comments="Source field: configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.629+01:00", comments="Source field: configuration.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.630+01:00", comments="Source field: configuration.version") public String getVersion() { return version; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.631+01:00", comments="Source field: configuration.version_date") public DateTime getVersionDate() { return versionDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.766+01:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.631+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 d5a4f803..c0126614 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-03-07T15:53:05.744+01:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.605+01:00", comments="Source field: configuration_value.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.744+01:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.605+01:00", comments="Source field: configuration_value.configuration_id") private Long configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.744+01:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.605+01:00", comments="Source field: configuration_value.configuration_attribute_id") private Long configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.745+01:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.606+01:00", comments="Source field: configuration_value.list_index") private Integer listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.745+01:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.606+01:00", comments="Source field: configuration_value.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.746+01:00", comments="Source field: configuration_value.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.608+01:00", comments="Source field: configuration_value.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.744+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.605+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-03-07T15:53:05.744+01:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.605+01:00", comments="Source field: configuration_value.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.744+01:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.605+01:00", comments="Source field: configuration_value.configuration_id") public Long getConfigurationId() { return configurationId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.745+01:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.606+01:00", comments="Source field: configuration_value.configuration_attribute_id") public Long getConfigurationAttributeId() { return configurationAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.745+01:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.606+01:00", comments="Source field: configuration_value.list_index") public Integer getListIndex() { return listIndex; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.745+01:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.608+01:00", comments="Source field: configuration_value.value") public String getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.746+01:00", comments="Source field: configuration_value.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.608+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 e8879dae..5573f1f8 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-03-07T15:53:05.778+01:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.648+01:00", comments="Source field: exam_configuration_map.id") private Long 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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.648+01:00", comments="Source field: exam_configuration_map.exam_id") private Long examId; - @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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.648+01:00", comments="Source field: exam_configuration_map.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.779+01:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.648+01:00", comments="Source field: exam_configuration_map.user_names") private String userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.778+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.648+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-03-07T15:53:05.778+01:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.648+01:00", comments="Source field: exam_configuration_map.id") public Long getId() { return 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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.648+01:00", comments="Source field: exam_configuration_map.exam_id") public Long getExamId() { return examId; } - @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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.648+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-03-07T15:53:05.779+01:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.648+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 a0d0d442..d717db0d 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-03-07T15:53:05.785+01:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.662+01:00", comments="Source field: exam.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.663+01:00", comments="Source field: exam.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.663+01:00", comments="Source field: exam.lms_setup_id") private Long lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.665+01:00", comments="Source field: exam.external_id") private String externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.665+01:00", comments="Source field: exam.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.672+01:00", comments="Source field: exam.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.672+01:00", comments="Source field: exam.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.672+01:00", comments="Source field: exam.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.672+01:00", comments="Source field: exam.quit_password") private String quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.672+01:00", comments="Source field: exam.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.784+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.662+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-03-07T15:53:05.785+01:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.663+01:00", comments="Source field: exam.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.663+01:00", comments="Source field: exam.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.664+01:00", comments="Source field: exam.lms_setup_id") public Long getLmsSetupId() { return lmsSetupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.665+01:00", comments="Source field: exam.external_id") public String getExternalId() { return externalId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.671+01:00", comments="Source field: exam.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.672+01:00", comments="Source field: exam.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.785+01:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.672+01:00", comments="Source field: exam.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.672+01:00", comments="Source field: exam.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.672+01:00", comments="Source field: exam.quit_password") public String getQuitPassword() { return quitPassword; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.786+01:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.672+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 0e49f917..ea57f298 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-03-07T15:53:05.806+01:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.690+01:00", comments="Source field: indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.806+01:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.690+01:00", comments="Source field: indicator.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.690+01:00", comments="Source field: indicator.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.690+01:00", comments="Source field: indicator.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.690+01:00", comments="Source field: indicator.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.806+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.689+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-03-07T15:53:05.806+01:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.690+01:00", comments="Source field: indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.690+01:00", comments="Source field: indicator.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.690+01:00", comments="Source field: indicator.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.690+01:00", comments="Source field: indicator.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.807+01:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.690+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 1745491f..af39cb82 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class InstitutionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.url_suffix") private String urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.logo_image") private String logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.697+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; @@ -31,32 +31,32 @@ public class InstitutionRecord { this.logoImage = logoImage; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.url_suffix") public String getUrlSuffix() { return urlSuffix; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.817+01:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.698+01:00", comments="Source field: institution.logo_image") public String getLogoImage() { return logoImage; } @@ -65,7 +65,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 CET 2019 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 CET 2019 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 CET 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java index 88ed38c3..58d95a81 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,34 +3,34 @@ 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-03-07T15:53:05.827+01:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.lms_type") private String lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.lms_url") private String lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.lms_clientname") private String lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.829+01:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.lms_clientsecret") private String lmsClientsecret; - @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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.lms_rest_api_token") private String lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.829+01:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.827+01:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+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; @@ -43,47 +43,47 @@ public class LmsSetupRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.827+01:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.lms_type") public String getLmsType() { return lmsType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.lms_url") public String getLmsUrl() { return lmsUrl; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.828+01:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.lms_clientname") public String getLmsClientname() { return lmsClientname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.829+01:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.lms_clientsecret") public String getLmsClientsecret() { return lmsClientsecret; } - @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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+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-03-07T15:53:05.829+01:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.709+01:00", comments="Source field: lms_setup.active") public Integer getActive() { return active; } @@ -92,7 +92,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 CET 2019 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 CET 2019 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 CET 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java index 68b9a868..d1474564 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-03-07T15:53:05.751+01:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.614+01:00", comments="Source field: orientation.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.615+01:00", comments="Source field: orientation.config_attribute_id") private Long configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.615+01:00", comments="Source field: orientation.template") private String template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.615+01:00", comments="Source field: orientation.view") private String view; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.615+01:00", comments="Source field: orientation.group") private String group; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.615+01:00", comments="Source field: orientation.x_position") private Integer xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.616+01:00", comments="Source field: orientation.y_position") private Integer yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.616+01:00", comments="Source field: orientation.width") private Integer width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.617+01:00", comments="Source field: orientation.height") private Integer height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.751+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.614+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-03-07T15:53:05.752+01:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.614+01:00", comments="Source field: orientation.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.615+01:00", comments="Source field: orientation.config_attribute_id") public Long getConfigAttributeId() { return configAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.615+01:00", comments="Source field: orientation.template") public String getTemplate() { return template; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.615+01:00", comments="Source field: orientation.view") public String getView() { return view; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.752+01:00", comments="Source field: orientation.group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.615+01:00", comments="Source field: orientation.group") public String getGroup() { return group; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.616+01:00", comments="Source field: orientation.x_position") public Integer getxPosition() { return xPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.616+01:00", comments="Source field: orientation.y_position") public Integer getyPosition() { return yPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.617+01:00", comments="Source field: orientation.width") public Integer getWidth() { return width; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.753+01:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.617+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 0e86759a..231aa8fb 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-03-07T15:53:05.839+01:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.719+01:00", comments="Source field: user_role.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.839+01:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.719+01:00", comments="Source field: user_role.user_id") private Long userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.719+01:00", comments="Source field: user_role.role_name") private String roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.839+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.719+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-03-07T15:53:05.839+01:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.719+01:00", comments="Source field: user_role.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.719+01:00", comments="Source field: user_role.user_id") public Long getUserId() { return userId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.840+01:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.719+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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/SebClientConfigRecord.java similarity index 68% rename from src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientCredentialsRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java index 0710bf91..dde3d0e3 100644 --- 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/SebClientConfigRecord.java @@ -1,32 +1,32 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; -import java.util.Date; import javax.annotation.Generated; +import org.joda.time.DateTime; -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") +public class SebClientConfigRecord { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.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-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.date") + private DateTime 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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.703+01:00", comments="Source field: seb_client_configuration.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) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source Table: seb_client_configuration") + public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, Integer active) { this.id = id; this.institutionId = institutionId; this.name = name; @@ -36,46 +36,46 @@ public class SebClientCredentialsRecord { 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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.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() { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.date") + public DateTime 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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.702+01:00", comments="Source field: seb_client_configuration.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") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.703+01:00", comments="Source field: seb_client_configuration.active") public Integer getActive() { return active; } /** * This method was generated by MyBatis Generator. - * This method corresponds to the database table seb_client_credentials + * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 CET 2019 */ @Override public String toString() { @@ -96,9 +96,9 @@ public class SebClientCredentialsRecord { /** * This method was generated by MyBatis Generator. - * This method corresponds to the database table seb_client_credentials + * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 CET 2019 */ @Override public boolean equals(Object that) { @@ -111,7 +111,7 @@ public class SebClientCredentialsRecord { if (getClass() != that.getClass()) { return false; } - SebClientCredentialsRecord other = (SebClientCredentialsRecord) that; + SebClientConfigRecord other = (SebClientConfigRecord) 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())) @@ -123,9 +123,9 @@ public class SebClientCredentialsRecord { /** * This method was generated by MyBatis Generator. - * This method corresponds to the database table seb_client_credentials + * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 CET 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java index 42b3e3d0..38877ec2 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-03-07T15:53:05.813+01:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.693+01:00", comments="Source field: threshold.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.813+01:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.693+01:00", comments="Source field: threshold.indicator_id") private Long indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.813+01:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.693+01:00", comments="Source field: threshold.value") private BigDecimal value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.814+01:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.693+01:00", comments="Source field: threshold.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.812+01:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.693+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-03-07T15:53:05.813+01:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.693+01:00", comments="Source field: threshold.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.813+01:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.693+01:00", comments="Source field: threshold.indicator_id") public Long getIndicatorId() { return indicatorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.814+01:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.693+01:00", comments="Source field: threshold.value") public BigDecimal getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.814+01:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.693+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 091eda2e..406d4472 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-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.726+01:00", comments="Source field: user_activity_log.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.726+01:00", comments="Source field: user_activity_log.user_uuid") private String userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.726+01:00", comments="Source field: user_activity_log.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.726+01:00", comments="Source field: user_activity_log.activity_type") private String activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+01:00", comments="Source field: user_activity_log.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+01:00", comments="Source field: user_activity_log.entity_id") private String entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+01:00", comments="Source field: user_activity_log.message") private String message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.726+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-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.726+01:00", comments="Source field: user_activity_log.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.726+01:00", comments="Source field: user_activity_log.user_uuid") public String getUserUuid() { return userUuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.726+01:00", comments="Source field: user_activity_log.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.726+01:00", comments="Source field: user_activity_log.activity_type") public String getActivityType() { return activityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+01:00", comments="Source field: user_activity_log.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+01:00", comments="Source field: user_activity_log.entity_id") public String getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.842+01:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.727+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 496ec6f0..20a4511c 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-03-07T15:53:05.833+01:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.username") private String username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.password") private String password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.email") private String email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.language") private String language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.timezone") private String timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.833+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+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-03-07T15:53:05.834+01:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.713+01:00", comments="Source field: user.username") public String getUsername() { return username; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.password") public String getPassword() { return password; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.email") public String getEmail() { return email; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.language") public String getLanguage() { return language; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+01:00", comments="Source field: user.timezone") public String getTimezone() { return timezone; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-07T15:53:05.834+01:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-03-11T09:59:52.714+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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 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 Thu Mar 07 15:53:05 CET 2019 + * @mbg.generated Mon Mar 11 09:59:52 CET 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/InternalEncryptionService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/InternalEncryptionService.java deleted file mode 100644 index 085256af..00000000 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/InternalEncryptionService.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -package ch.ethz.seb.sebserver.webservice.servicelayer; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Lazy; -import org.springframework.core.env.Environment; -import org.springframework.security.crypto.encrypt.Encryptors; -import org.springframework.stereotype.Service; - -import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; - -@Lazy -@Service -@WebServiceProfile -public class InternalEncryptionService { - - private static final Logger log = LoggerFactory.getLogger(InternalEncryptionService.class); - - static final String SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY = "sebserver.webservice.internalSecret"; - private static final String DEFAULT_SALT = "b7dbe99bbfa3e21e"; - - private final Environment environment; - - protected InternalEncryptionService(final Environment environment) { - this.environment = environment; - } - - public String encrypt(final String text) { - try { - return Encryptors.text( - this.environment.getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY), - DEFAULT_SALT).encrypt(text); - } catch (final Exception e) { - log.error("Failed to encrypt text: ", e); - return text; - } - } - - public String decrypt(final String text) { - try { - return Encryptors.text( - this.environment.getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY), - DEFAULT_SALT).decrypt(text); - } catch (final Exception e) { - log.error("Failed to decrypt text: ", e); - return text; - } - } - - public String encrypt(final String text, final CharSequence salt) { - try { - return Encryptors.text( - this.environment.getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY), - salt).encrypt(text); - } catch (final Exception e) { - log.error("Failed to encrypt text: ", e); - return text; - } - } - - public String decrypt(final String text, final CharSequence salt) { - try { - return Encryptors.text( - this.environment.getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY), - salt).decrypt(text); - } catch (final Exception e) { - log.error("Failed to decrypt text: ", e); - return text; - } - } - - public String encrypt(final String text, final CharSequence secret, final CharSequence salt) { - try { - return Encryptors.text(secret, salt).encrypt(text); - } catch (final Exception e) { - log.error("Failed to encrypt text: ", e); - return text; - } - } - - public String decrypt(final String text, final CharSequence secret, final CharSequence salt) { - try { - return Encryptors.text(secret, salt).decrypt(text); - } catch (final Exception e) { - log.error("Failed to decrypt text: ", e); - return text; - } - } - -} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationServiceImpl.java index 41831cd6..78ffbdd3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationServiceImpl.java @@ -65,6 +65,14 @@ public class AuthorizationServiceImpl implements AuthorizationService { .withInstitutionalPrivilege(PrivilegeType.READ_ONLY) .create(); + // grants for seb client config + addPrivilege(EntityType.SEB_CLIENT_CONFIGURATION) + .forRole(UserRole.SEB_SERVER_ADMIN) + .withBasePrivilege(PrivilegeType.WRITE) + .andForRole(UserRole.INSTITUTIONAL_ADMIN) + .withInstitutionalPrivilege(PrivilegeType.WRITE) + .create(); + // grants for lms setup addPrivilege(EntityType.LMS_SETUP) .forRole(UserRole.SEB_SERVER_ADMIN) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentialService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentialService.java new file mode 100644 index 00000000..7734c38e --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentialService.java @@ -0,0 +1,185 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.servicelayer.client; + +import java.io.UnsupportedEncodingException; +import java.security.SecureRandom; + +import org.apache.commons.lang3.RandomStringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Lazy; +import org.springframework.core.env.Environment; +import org.springframework.security.crypto.codec.Hex; +import org.springframework.security.crypto.encrypt.Encryptors; +import org.springframework.stereotype.Service; + +import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; +import ch.ethz.seb.sebserver.gbl.util.Result; + +@Lazy +@Service +@WebServiceProfile +public class ClientCredentialService { + + private static final Logger log = LoggerFactory.getLogger(ClientCredentialService.class); + + static final String SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY = "sebserver.webservice.internalSecret"; + static final CharSequence DEFAULT_SALT = "b7dbe99bbfa3e21e"; + + private final Environment environment; + + protected ClientCredentialService(final Environment environment) { + this.environment = environment; + } + + public Result createGeneratedClientCredentials() { + return createGeneratedClientCredentials(null); + } + + public Result createGeneratedClientCredentials(final CharSequence salt) { + return Result.tryCatch(() -> { + + try { + return encryptedClientCredentials( + new ClientCredentials( + generateClientId().toString(), + generateClientSecret().toString(), + null), + salt); + } catch (final UnsupportedEncodingException e) { + log.error("Error while trying to generate client credentials: ", e); + throw new RuntimeException("cause: ", e); + } + }); + } + + public ClientCredentials encryptedClientCredentials(final ClientCredentials clientCredentials) { + return encryptedClientCredentials(clientCredentials, null); + } + + public ClientCredentials encryptedClientCredentials( + final ClientCredentials clientCredentials, + final CharSequence salt) { + + final CharSequence secret = this.environment + .getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY); + + return new ClientCredentials( + (clientCredentials.clientId != null) + ? encrypt(clientCredentials.clientId, secret, salt).toString() + : null, + (clientCredentials.secret != null) + ? encrypt(clientCredentials.secret, secret, salt).toString() + : null, + (clientCredentials.accessToken != null) + ? encrypt(clientCredentials.accessToken, secret, salt).toString() + : null); + } + + public CharSequence getPlainClientId(final ClientCredentials credentials) { + return getPlainClientId(credentials, null); + } + + public CharSequence getPlainClientId(final ClientCredentials credentials, final CharSequence salt) { + if (credentials == null || credentials.clientId == null) { + return null; + } + + final CharSequence secret = this.environment + .getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY); + + return this.decrypt(credentials.clientId, secret, salt); + } + + public CharSequence getPlainClientSecret(final ClientCredentials credentials) { + return getPlainClientSecret(credentials, null); + } + + public CharSequence getPlainClientSecret(final ClientCredentials credentials, final CharSequence salt) { + if (credentials == null || credentials.secret == null) { + return null; + } + + final CharSequence secret = this.environment + .getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY); + return this.decrypt(credentials.secret, secret, salt); + } + + public CharSequence getPlainAccessToken(final ClientCredentials credentials) { + return getPlainAccessToken(credentials, null); + } + + public CharSequence getPlainAccessToken(final ClientCredentials credentials, final CharSequence salt) { + if (credentials == null || credentials.accessToken == null) { + return null; + } + + final CharSequence secret = this.environment + .getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY); + return this.decrypt(credentials.accessToken, secret, salt); + } + + CharSequence encrypt(final CharSequence text, final CharSequence secret, final CharSequence salt) { + if (text == null) { + throw new IllegalArgumentException("Text has null reference"); + } + + try { + return Encryptors + .delux(secret, getSalt(salt)) + .encrypt(text.toString()); + + } catch (final Exception e) { + log.error("Failed to encrypt text: ", e); + return text; + } + } + + CharSequence decrypt(final CharSequence text, final CharSequence secret, final CharSequence salt) { + if (text == null) { + throw new IllegalArgumentException("Text has null reference"); + } + + try { + + return Encryptors + .delux(secret, getSalt(salt)) + .decrypt(text.toString()); + + } catch (final Exception e) { + log.error("Failed to decrypt text: ", e); + return text; + } + } + + private final static char[] possibleCharacters = (new String( + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789~`!@#$%^&*()-_=+[{]}?")) + .toCharArray(); + + private CharSequence getSalt(final CharSequence saltPlain) throws UnsupportedEncodingException { + final CharSequence _salt = (saltPlain == null || saltPlain.length() <= 0) + ? this.environment.getProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY, DEFAULT_SALT.toString()) + : saltPlain; + return new String(Hex.encode(_salt.toString().getBytes("UTF-8"))); + } + + private CharSequence generateClientId() { + return RandomStringUtils.random( + 16, 0, possibleCharacters.length - 1, false, false, + possibleCharacters, new SecureRandom()); + } + + private CharSequence generateClientSecret() throws UnsupportedEncodingException { + return RandomStringUtils.random( + 64, 0, possibleCharacters.length - 1, false, false, + possibleCharacters, new SecureRandom()); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentials.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentials.java new file mode 100644 index 00000000..652c9a91 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentials.java @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.servicelayer.client; + +public final class ClientCredentials { + public final String clientId; + public final String secret; + public final String accessToken; + + public ClientCredentials( + final String clientId, + final String secret, + final String accessToken) { + + this.clientId = clientId; + this.secret = secret; + this.accessToken = accessToken; + } +} \ No newline at end of file diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/FilterMap.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/FilterMap.java index 51485663..0c2d9cc5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/FilterMap.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/FilterMap.java @@ -16,6 +16,7 @@ import ch.ethz.seb.sebserver.gbl.api.POSTMapper; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; +import ch.ethz.seb.sebserver.gbl.model.institution.SebClientConfig; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.webservice.datalayer.batis.JodaTimeTypeResolver; @@ -65,6 +66,10 @@ public class FilterMap extends POSTMapper { return JodaTimeTypeResolver.getDateTime(getString(Exam.FILTER_ATTR_FROM)); } + public DateTime getSebClientConfigFromTime() { + return JodaTimeTypeResolver.getDateTime(getString(SebClientConfig.FILTER_ATTR_FROM)); + } + public String getExamQuizId() { return getString(Exam.FILTER_ATTR_QUIZ_ID); } 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 c8bc4a64..39c40170 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 @@ -11,21 +11,9 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.dao; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionSupportDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentials; public interface LmsSetupDAO extends ActivatableEntityDAO, BulkActionSupportDAO { - Result getLmsAPIAccessCredentials(String lmsSetupId); - - final class Credentials { - public final String clientId; - public final String secret; - public final String accessToken; - - public Credentials(final String clientId, final String secret, final String accessToken) { - super(); - this.clientId = clientId; - this.secret = secret; - this.accessToken = accessToken; - } - } + Result getLmsAPIAccessCredentials(String lmsSetupId); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/SebClientConfigDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/SebClientConfigDAO.java new file mode 100644 index 00000000..e23be8c3 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/SebClientConfigDAO.java @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.servicelayer.dao; + +import ch.ethz.seb.sebserver.gbl.model.institution.SebClientConfig; +import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionSupportDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentials; + +public interface SebClientConfigDAO extends + ActivatableEntityDAO, + BulkActionSupportDAO { + + Result getSebClientCredentials(String modelId); + +} 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 ec22e67c..60a94458 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 @@ -33,8 +33,9 @@ import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.LmsSetupRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.LmsSetupRecordMapper; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.LmsSetupRecord; -import ch.ethz.seb.sebserver.webservice.servicelayer.InternalEncryptionService; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkAction; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentialService; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentials; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.DAOLoggingSupport; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.LmsSetupDAO; @@ -46,11 +47,11 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.dao.TransactionHandler; public class LmsSetupDAOImpl implements LmsSetupDAO { private final LmsSetupRecordMapper lmsSetupRecordMapper; - private final InternalEncryptionService internalEncryptionService; + private final ClientCredentialService internalEncryptionService; protected LmsSetupDAOImpl( final LmsSetupRecordMapper lmsSetupRecordMapper, - final InternalEncryptionService internalEncryptionService) { + final ClientCredentialService internalEncryptionService) { this.lmsSetupRecordMapper = lmsSetupRecordMapper; this.internalEncryptionService = internalEncryptionService; @@ -65,7 +66,7 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { @Transactional(readOnly = true) public Result byPK(final Long id) { return recordById(id) - .flatMap(LmsSetupDAOImpl::toDomainModel); + .flatMap(this::toDomainModel); } @Override @@ -88,7 +89,7 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { : example.build().execute(); return records.stream() - .map(LmsSetupDAOImpl::toDomainModel) + .map(this::toDomainModel) .flatMap(DAOLoggingSupport::logUnexpectedErrorAndSkip) .collect(Collectors.toList()); }); @@ -119,7 +120,7 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { .build() .execute() .stream() - .map(LmsSetupDAOImpl::toDomainModel) + .map(this::toDomainModel) .flatMap(DAOLoggingSupport::logUnexpectedErrorAndSkip) .filter(predicate) .collect(Collectors.toList()); @@ -131,23 +132,27 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { public Result save(final LmsSetup lmsSetup) { return Result.tryCatch(() -> { + final ClientCredentials lmsCredentials = this.internalEncryptionService.encryptedClientCredentials( + new ClientCredentials( + lmsSetup.lmsAuthName, + lmsSetup.lmsAuthSecret, + lmsSetup.lmsRestApiToken)); + final LmsSetupRecord newRecord = new LmsSetupRecord( lmsSetup.id, lmsSetup.institutionId, lmsSetup.name, (lmsSetup.lmsType != null) ? lmsSetup.lmsType.name() : null, lmsSetup.lmsApiUrl, - lmsSetup.lmsAuthName, - (StringUtils.isNotBlank(lmsSetup.lmsAuthSecret)) - ? this.internalEncryptionService.encrypt(lmsSetup.lmsAuthSecret) - : null, - lmsSetup.lmsRestApiToken, + lmsCredentials.clientId, + lmsCredentials.secret, + lmsCredentials.accessToken, null); this.lmsSetupRecordMapper.updateByPrimaryKeySelective(newRecord); return this.lmsSetupRecordMapper.selectByPrimaryKey(lmsSetup.id); }) - .flatMap(LmsSetupDAOImpl::toDomainModel) + .flatMap(this::toDomainModel) .onErrorDo(TransactionHandler::rollback); } @@ -156,23 +161,27 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { public Result createNew(final LmsSetup lmsSetup) { return Result.tryCatch(() -> { + final ClientCredentials lmsCredentials = this.internalEncryptionService.encryptedClientCredentials( + new ClientCredentials( + lmsSetup.lmsAuthName, + lmsSetup.lmsAuthSecret, + lmsSetup.lmsRestApiToken)); + final LmsSetupRecord newRecord = new LmsSetupRecord( null, lmsSetup.institutionId, lmsSetup.name, (lmsSetup.lmsType != null) ? lmsSetup.lmsType.name() : null, lmsSetup.lmsApiUrl, - lmsSetup.lmsAuthName, - (StringUtils.isNotBlank(lmsSetup.lmsAuthSecret)) - ? this.internalEncryptionService.encrypt(lmsSetup.lmsAuthSecret) - : null, - lmsSetup.lmsRestApiToken, + lmsCredentials.clientId, + lmsCredentials.secret, + lmsCredentials.accessToken, BooleanUtils.toInteger(false)); this.lmsSetupRecordMapper.insert(newRecord); return newRecord; }) - .flatMap(LmsSetupDAOImpl::toDomainModel) + .flatMap(this::toDomainModel) .onErrorDo(TransactionHandler::rollback); } @@ -252,7 +261,7 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { .build() .execute() .stream() - .map(LmsSetupDAOImpl::toDomainModel) + .map(this::toDomainModel) .flatMap(DAOLoggingSupport::logUnexpectedErrorAndSkip) .collect(Collectors.toList()); }); @@ -260,12 +269,12 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { @Override @Transactional(readOnly = true) - public Result getLmsAPIAccessCredentials(final String lmsSetupId) { + public Result getLmsAPIAccessCredentials(final String lmsSetupId) { return Result.tryCatch(() -> { final LmsSetupRecord record = this.lmsSetupRecordMapper .selectByPrimaryKey(Long.parseLong(lmsSetupId)); - return new Credentials( + return new ClientCredentials( record.getLmsClientname(), record.getLmsClientsecret(), record.getLmsRestApiToken()); @@ -297,16 +306,25 @@ public class LmsSetupDAOImpl implements LmsSetupDAO { }); } - private static Result toDomainModel(final LmsSetupRecord record) { + private Result toDomainModel(final LmsSetupRecord record) { + + final ClientCredentials clientCredentials = new ClientCredentials( + record.getLmsClientname(), + record.getLmsClientsecret(), + record.getLmsRestApiToken()); + + final CharSequence plainClientId = this.internalEncryptionService.getPlainClientId(clientCredentials); + final CharSequence plainAccessToken = this.internalEncryptionService.getPlainAccessToken(clientCredentials); + return Result.tryCatch(() -> new LmsSetup( record.getId(), record.getInstitutionId(), record.getName(), LmsType.valueOf(record.getLmsType()), - record.getLmsClientname(), + (plainClientId != null) ? plainClientId.toString() : null, null, record.getLmsUrl(), - record.getLmsRestApiToken(), + (plainAccessToken != null) ? plainAccessToken.toString() : null, BooleanUtils.toBooleanObject(record.getActive()))); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SebClientConfigDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SebClientConfigDAOImpl.java new file mode 100644 index 00000000..5ca2aad1 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SebClientConfigDAOImpl.java @@ -0,0 +1,299 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.servicelayer.dao.impl; + +import static org.mybatis.dynamic.sql.SqlBuilder.*; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.EntityKey; +import ch.ethz.seb.sebserver.gbl.model.institution.SebClientConfig; +import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.SebClientConfigRecordDynamicSqlSupport; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.SebClientConfigRecordMapper; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.SebClientConfigRecord; +import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkAction; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentialService; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentials; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.DAOLoggingSupport; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ResourceNotFoundException; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.SebClientConfigDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.TransactionHandler; + +@Lazy +@Component +public class SebClientConfigDAOImpl implements SebClientConfigDAO { + + private final SebClientConfigRecordMapper sebClientConfigRecordMapper; + private final ClientCredentialService clientCredentialService; + + protected SebClientConfigDAOImpl( + final SebClientConfigRecordMapper sebClientConfigRecordMapper, + final ClientCredentialService clientCredentialService) { + + this.sebClientConfigRecordMapper = sebClientConfigRecordMapper; + this.clientCredentialService = clientCredentialService; + } + + @Override + public EntityType entityType() { + return EntityType.SEB_CLIENT_CONFIGURATION; + } + + @Override + @Transactional(readOnly = true) + public Result byPK(final Long id) { + return recordById(id) + .flatMap(SebClientConfigDAOImpl::toDomainModel); + } + + @Override + @Transactional(readOnly = true) + public Result> all(final Long institutionId, final Boolean active) { + return Result.tryCatch(() -> { + + final List records = (active != null) + ? this.sebClientConfigRecordMapper.selectByExample() + .where( + SebClientConfigRecordDynamicSqlSupport.institutionId, + isEqualToWhenPresent(institutionId)) + .and( + SebClientConfigRecordDynamicSqlSupport.active, + isEqualToWhenPresent(BooleanUtils.toIntegerObject(active))) + .build() + .execute() + : this.sebClientConfigRecordMapper.selectByExample().build().execute(); + + return records.stream() + .map(SebClientConfigDAOImpl::toDomainModel) + .flatMap(DAOLoggingSupport::logUnexpectedErrorAndSkip) + .collect(Collectors.toList()); + }); + } + + @Override + @Transactional(readOnly = true) + public Result> allMatching( + final FilterMap filterMap, + final Predicate predicate) { + + return Result.tryCatch(() -> { + + return this.sebClientConfigRecordMapper + .selectByExample() + .where( + SebClientConfigRecordDynamicSqlSupport.institutionId, + isEqualToWhenPresent(filterMap.getInstitutionId())) + .and( + SebClientConfigRecordDynamicSqlSupport.name, + isLikeWhenPresent(filterMap.getName())) + .and( + SebClientConfigRecordDynamicSqlSupport.date, + isGreaterThanOrEqualToWhenPresent(filterMap.getSebClientConfigFromTime())) + .and( + SebClientConfigRecordDynamicSqlSupport.active, + isEqualToWhenPresent(filterMap.getActiveAsInt())) + .build() + .execute() + .stream() + .map(SebClientConfigDAOImpl::toDomainModel) + .flatMap(DAOLoggingSupport::logUnexpectedErrorAndSkip) + .filter(predicate) + .collect(Collectors.toList()); + }); + } + + @Override + @Transactional(readOnly = true) + public boolean isActive(final String modelId) { + if (StringUtils.isBlank(modelId)) { + return false; + } + + return this.sebClientConfigRecordMapper.countByExample() + .where(SebClientConfigRecordDynamicSqlSupport.id, isEqualTo(Long.valueOf(modelId))) + .and(SebClientConfigRecordDynamicSqlSupport.active, isEqualTo(BooleanUtils.toInteger(true))) + .build() + .execute() + .longValue() > 0; + } + + @Override + @Transactional + public Result> setActive(final Set all, final boolean active) { + return Result.tryCatch(() -> { + + final List ids = extractPKsFromKeys(all); + final SebClientConfigRecord record = new SebClientConfigRecord( + null, null, null, null, null, null, + BooleanUtils.toIntegerObject(active)); + + this.sebClientConfigRecordMapper.updateByExampleSelective(record) + .where(SebClientConfigRecordDynamicSqlSupport.id, isIn(ids)) + .build() + .execute(); + + return ids.stream() + .map(id -> new EntityKey(id, EntityType.LMS_SETUP)) + .collect(Collectors.toList()); + }); + } + + @Override + @Transactional + public Result createNew(final SebClientConfig sebClientConfig) { + return this.clientCredentialService + .createGeneratedClientCredentials() + .map(cc -> { + final SebClientConfigRecord newRecord = new SebClientConfigRecord( + null, + sebClientConfig.institutionId, + sebClientConfig.name, + DateTime.now(DateTimeZone.UTC), + cc.clientId, + cc.secret, + BooleanUtils.toInteger(BooleanUtils.isTrue(sebClientConfig.active))); + + this.sebClientConfigRecordMapper.insert(newRecord); + return newRecord; + }) + .flatMap(SebClientConfigDAOImpl::toDomainModel) + .onErrorDo(TransactionHandler::rollback); + } + + @Override + @Transactional + public Result save(final SebClientConfig sebClientConfig) { + return Result.tryCatch(() -> { + + final SebClientConfigRecord newRecord = new SebClientConfigRecord( + sebClientConfig.id, + null, + sebClientConfig.name, + null, + null, + null, + null); + + this.sebClientConfigRecordMapper.updateByPrimaryKeySelective(newRecord); + return this.sebClientConfigRecordMapper.selectByPrimaryKey(sebClientConfig.id); + }) + .flatMap(SebClientConfigDAOImpl::toDomainModel) + .onErrorDo(TransactionHandler::rollback); + } + + @Override + @Transactional + public Result> delete(final Set all) { + return Result.tryCatch(() -> { + + final List ids = extractPKsFromKeys(all); + + this.sebClientConfigRecordMapper.deleteByExample() + .where(SebClientConfigRecordDynamicSqlSupport.id, isIn(ids)) + .build() + .execute(); + + return ids.stream() + .map(id -> new EntityKey(id, EntityType.SEB_CLIENT_CONFIGURATION)) + .collect(Collectors.toList()); + }); + } + + @Override + @Transactional(readOnly = true) + public Result> loadEntities(final Collection keys) { + return Result.tryCatch(() -> { + final List ids = extractPKsFromKeys(keys); + + return this.sebClientConfigRecordMapper.selectByExample() + .where(SebClientConfigRecordDynamicSqlSupport.id, isIn(ids)) + .build() + .execute() + .stream() + .map(SebClientConfigDAOImpl::toDomainModel) + .flatMap(DAOLoggingSupport::logUnexpectedErrorAndSkip) + .collect(Collectors.toList()); + }); + } + + @Override + @Transactional(readOnly = true) + public Set getDependencies(final BulkAction bulkAction) { + // all of institution + if (bulkAction.sourceType == EntityType.INSTITUTION) { + return getDependencies(bulkAction, this::allIdsOfInstitution); + } + + return Collections.emptySet(); + } + + @Override + @Transactional(readOnly = true) + public Result getSebClientCredentials(final String modelId) { + return recordByModelId(modelId) + .map(rec -> new ClientCredentials(rec.getClientName(), rec.getClientSecret(), null)); + } + + private Result> allIdsOfInstitution(final EntityKey institutionKey) { + return Result.tryCatch(() -> { + return this.sebClientConfigRecordMapper.selectIdsByExample() + .where(SebClientConfigRecordDynamicSqlSupport.institutionId, + isEqualTo(Long.valueOf(institutionKey.modelId))) + .build() + .execute() + .stream() + .map(id -> new EntityKey(id, EntityType.SEB_CLIENT_CONFIGURATION)) + .collect(Collectors.toList()); + }); + } + + private Result recordByModelId(final String modelId) { + return Result.tryCatch(() -> { + return recordById(Long.parseLong(modelId)).getOrThrow(); + }); + } + + private Result recordById(final Long id) { + return Result.tryCatch(() -> { + final SebClientConfigRecord record = this.sebClientConfigRecordMapper.selectByPrimaryKey(id); + if (record == null) { + throw new ResourceNotFoundException( + EntityType.SEB_CLIENT_CONFIGURATION, + String.valueOf(id)); + } + return record; + }); + } + + private static Result toDomainModel(final SebClientConfigRecord record) { + return Result.tryCatch(() -> new SebClientConfig( + record.getId(), + record.getInstitutionId(), + record.getName(), + record.getDate(), + BooleanUtils.toBooleanObject(record.getActive()))); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java index 08575066..e00a3339 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java @@ -8,8 +8,6 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.lms; -import java.io.InputStream; - import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; import ch.ethz.seb.sebserver.gbl.util.Result; @@ -19,8 +17,4 @@ public interface LmsAPIService { Result createLmsAPITemplate(LmsSetup lmsSetup); - Result createSEBStartConfiguration(Long lmsSetupId); - - Result createSEBStartConfiguration(LmsSetup lmsSetup); - } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/LmsAPIServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/LmsAPIServiceImpl.java index 7883e3a2..65a991b4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/LmsAPIServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/LmsAPIServiceImpl.java @@ -8,10 +8,6 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.lms.impl; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; - import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.client.ClientHttpRequestFactory; @@ -21,7 +17,7 @@ import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Result; -import ch.ethz.seb.sebserver.webservice.servicelayer.InternalEncryptionService; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentialService; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.LmsSetupDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPIService; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPITemplate; @@ -31,7 +27,7 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPITemplate; public class LmsAPIServiceImpl implements LmsAPIService { private final LmsSetupDAO lmsSetupDAO; - private final InternalEncryptionService internalEncryptionService; + private final ClientCredentialService internalEncryptionService; private final ClientHttpRequestFactory clientHttpRequestFactory; private final String[] openEdxAlternativeTokenRequestPaths; @@ -39,7 +35,7 @@ public class LmsAPIServiceImpl implements LmsAPIService { public LmsAPIServiceImpl( final LmsSetupDAO lmsSetupDAO, - final InternalEncryptionService internalEncryptionService, + final ClientCredentialService internalEncryptionService, final ClientHttpRequestFactory clientHttpRequestFactory, @Value("${sebserver.lms.openedix.api.token.request.paths}") final String alternativeTokenRequestPaths) { @@ -81,31 +77,31 @@ public class LmsAPIServiceImpl implements LmsAPIService { } - @Override - public Result createSEBStartConfiguration(final Long lmsSetupId) { - return this.lmsSetupDAO - .byPK(lmsSetupId) - .flatMap(this::createSEBStartConfiguration); - } - - @Override - public Result createSEBStartConfiguration(final LmsSetup lmsSetup) { - - // TODO implementation of creation of SEB start configuration for specified LmsSetup - // A SEB start configuration should at least contain the SEB-Client-Credentials to access the SEB Server API - // and the SEB Server URL - // - // To Clarify : The format of a SEB start configuration - // To Clarify : How the file should be encrypted (use case) maybe we need another encryption-secret for this that can be given by - // an administrator on SEB start configuration creation time - - return Result.tryCatch(() -> { - try { - return new ByteArrayInputStream("TODO".getBytes("UTF-8")); - } catch (final UnsupportedEncodingException e) { - throw new RuntimeException("cause: ", e); - } - }); - } +// @Override +// public Result createSEBStartConfiguration(final Long lmsSetupId) { +// return this.lmsSetupDAO +// .byPK(lmsSetupId) +// .flatMap(this::createSEBStartConfiguration); +// } +// +// @Override +// public Result createSEBStartConfiguration(final LmsSetup lmsSetup) { +// +// // TODO implementation of creation of SEB start configuration for specified LmsSetup +// // A SEB start configuration should at least contain the SEB-Client-Credentials to access the SEB Server API +// // and the SEB Server URL +// // +// // To Clarify : The format of a SEB start configuration +// // To Clarify : How the file should be encrypted (use case) maybe we need another encryption-secret for this that can be given by +// // an administrator on SEB start configuration creation time +// +// return Result.tryCatch(() -> { +// try { +// return new ByteArrayInputStream("TODO".getBytes("UTF-8")); +// } catch (final UnsupportedEncodingException e) { +// throw new RuntimeException("cause: ", e); +// } +// }); +// } } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/MockupLmsAPITemplate.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/MockupLmsAPITemplate.java index 4bfdfc89..e187e566 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/MockupLmsAPITemplate.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/MockupLmsAPITemplate.java @@ -24,8 +24,9 @@ import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetupTestResult; import ch.ethz.seb.sebserver.gbl.model.user.ExamineeAccountDetails; import ch.ethz.seb.sebserver.gbl.util.Result; -import ch.ethz.seb.sebserver.webservice.servicelayer.InternalEncryptionService; import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService.SortOrder; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentialService; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentials; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.LmsSetupDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPITemplate; @@ -34,20 +35,20 @@ final class MockupLmsAPITemplate implements LmsAPITemplate { public static final String MOCKUP_LMS_CLIENT_NAME = "mockupLmsClientName"; public static final String MOCKUP_LMS_CLIENT_SECRET = "mockupLmsClientSecret"; - private final InternalEncryptionService internalEncryptionService; + private final ClientCredentialService clientCredentialService; private final LmsSetupDAO lmsSetupDao; private final LmsSetup setup; - private LmsSetupDAO.Credentials credentials = null; + private ClientCredentials credentials = null; private final Collection mockups; MockupLmsAPITemplate( final LmsSetupDAO lmsSetupDao, final LmsSetup setup, - final InternalEncryptionService internalEncryptionService) { + final ClientCredentialService clientCredentialService) { this.lmsSetupDao = lmsSetupDao; - this.internalEncryptionService = internalEncryptionService; + this.clientCredentialService = clientCredentialService; if (!setup.isActive() || setup.lmsType != LmsType.MOCKUP) { throw new IllegalArgumentException(); } @@ -191,9 +192,15 @@ final class MockupLmsAPITemplate implements LmsAPITemplate { .getLmsAPIAccessCredentials(this.setup.getModelId()) .getOrThrow(); - assert (this.credentials.clientId.equals("lmsMockupClientId")) : "wrong clientId"; - assert (this.internalEncryptionService.decrypt(this.credentials.clientId) - .equals("lmsMockupSecret")) : "wrong clientId"; + final CharSequence plainClientId = this.clientCredentialService.getPlainClientId(this.credentials); + if (!"lmsMockupClientId".equals(plainClientId)) { + throw new IllegalAccessError(); + } + + final CharSequence plainClientSecret = this.clientCredentialService.getPlainClientSecret(this.credentials); + if (!"lmsMockupSecret".equals(plainClientSecret)) { + throw new IllegalAccessError(); + } } catch (final Exception e) { this.credentials = null; } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/OpenEdxLmsAPITemplate.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/OpenEdxLmsAPITemplate.java index 7d720eb5..06adbf54 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/OpenEdxLmsAPITemplate.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/OpenEdxLmsAPITemplate.java @@ -36,9 +36,9 @@ import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetupTestResult; import ch.ethz.seb.sebserver.gbl.model.user.ExamineeAccountDetails; import ch.ethz.seb.sebserver.gbl.util.Result; -import ch.ethz.seb.sebserver.webservice.servicelayer.InternalEncryptionService; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentialService; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentials; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.LmsSetupDAO; -import ch.ethz.seb.sebserver.webservice.servicelayer.dao.LmsSetupDAO.Credentials; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPITemplate; final class OpenEdxLmsAPITemplate implements LmsAPITemplate { @@ -52,7 +52,7 @@ final class OpenEdxLmsAPITemplate implements LmsAPITemplate { private final String lmsSetupId; private final LmsSetupDAO lmsSetupDAO; private final ClientHttpRequestFactory clientHttpRequestFactory; - private final InternalEncryptionService internalEncryptionService; + private final ClientCredentialService clientCredentialService; private final Set knownTokenAccessPaths; private OAuth2RestTemplate restTemplate = null; @@ -60,14 +60,14 @@ final class OpenEdxLmsAPITemplate implements LmsAPITemplate { OpenEdxLmsAPITemplate( final String lmsSetupId, final LmsSetupDAO lmsSetupDAO, - final InternalEncryptionService internalEncryptionService, + final ClientCredentialService clientCredentialService, final ClientHttpRequestFactory clientHttpRequestFactory, final String[] alternativeTokenRequestPaths) { this.lmsSetupId = lmsSetupId; this.lmsSetupDAO = lmsSetupDAO; this.clientHttpRequestFactory = clientHttpRequestFactory; - this.internalEncryptionService = internalEncryptionService; + this.clientCredentialService = clientCredentialService; this.knownTokenAccessPaths = new HashSet<>(); this.knownTokenAccessPaths.add(OPEN_EDX_DEFAULT_TOKEN_REQUEST_PATH); @@ -194,7 +194,7 @@ final class OpenEdxLmsAPITemplate implements LmsAPITemplate { } } - final Credentials credentials = this.lmsSetupDAO + final ClientCredentials credentials = this.lmsSetupDAO .getLmsAPIAccessCredentials(this.lmsSetupId) .getOrThrow(); @@ -225,15 +225,16 @@ final class OpenEdxLmsAPITemplate implements LmsAPITemplate { private OAuth2RestTemplate createRestTemplate( final LmsSetup lmsSetup, - final LmsSetupDAO.Credentials credentials, + final ClientCredentials credentials, final String accessTokenRequestPath) { - final String lmsAuthSecret = this.internalEncryptionService.decrypt(credentials.secret); + final CharSequence plainClientId = this.clientCredentialService.getPlainClientId(credentials); + final CharSequence plainClientSecret = this.clientCredentialService.getPlainClientSecret(credentials); final ClientCredentialsResourceDetails details = new ClientCredentialsResourceDetails(); details.setAccessTokenUri(lmsSetup.lmsApiUrl + accessTokenRequestPath); - details.setClientId(credentials.clientId); - details.setClientSecret(lmsAuthSecret); + details.setClientId(plainClientId.toString()); + details.setClientSecret(plainClientSecret.toString()); details.setGrantType("client_credentials"); // TODO: accordingly to the documentation (https://course-catalog-api-guide.readthedocs.io/en/latest/authentication/#create-an-account-on-edx-org-for-api-access) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/seb/SebClientConfigService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/seb/SebClientConfigService.java new file mode 100644 index 00000000..8a663b59 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/seb/SebClientConfigService.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.servicelayer.seb; + +import java.io.InputStream; + +import ch.ethz.seb.sebserver.gbl.model.institution.SebClientConfig; +import ch.ethz.seb.sebserver.gbl.util.Result; + +public interface SebClientConfigService { + + boolean hasSebClientConfigurationForIntitution(Long institutionId); + + Result autoCreateSebClientConfigurationForIntitution(Long institutionId); + + Result exportSebClientConfigurationOfInstitution(Long institutionId); + + default Result exportSebClientConfiguration(final String modelId) { + return Result.tryCatchOf(() -> { + return exportSebClientConfigurationOfInstitution(Long.parseLong(modelId)); + }); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/seb/SebClientConfigServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/seb/SebClientConfigServiceImpl.java new file mode 100644 index 00000000..149687b9 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/seb/SebClientConfigServiceImpl.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.servicelayer.seb; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.util.Collection; +import java.util.Optional; +import java.util.UUID; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.web.util.UriComponentsBuilder; + +import ch.ethz.seb.sebserver.gbl.model.institution.Institution; +import ch.ethz.seb.sebserver.gbl.model.institution.SebClientConfig; +import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; +import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentialService; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentials; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.InstitutionDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.SebClientConfigDAO; + +@Lazy +@Service +@WebServiceProfile +public class SebClientConfigServiceImpl implements SebClientConfigService { + + private final InstitutionDAO institutionDAO; + private final SebClientConfigDAO sebClientConfigDAO; + private final ClientCredentialService clientCredentialService; + private final String httpScheme; + private final String serverAddress; + private final String serverPort; + private final String sebClientAPIEndpoint; + + protected SebClientConfigServiceImpl( + final InstitutionDAO institutionDAO, + final SebClientConfigDAO sebClientConfigDAO, + final ClientCredentialService clientCredentialService, + @Value("${sebserver.webservice.http.scheme}") final String httpScheme, + @Value("${server.address}") final String serverAddress, + @Value("${server.port}") final String serverPort, + @Value("${sebserver.webservice.api.exam.endpoint}") final String sebClientAPIEndpoint) { + + this.institutionDAO = institutionDAO; + this.sebClientConfigDAO = sebClientConfigDAO; + this.clientCredentialService = clientCredentialService; + this.httpScheme = httpScheme; + this.serverAddress = serverAddress; + this.serverPort = serverPort; + this.sebClientAPIEndpoint = sebClientAPIEndpoint; + } + + @Override + public boolean hasSebClientConfigurationForIntitution(final Long institutionId) { + final Result> all = this.sebClientConfigDAO.all(institutionId, true); + return all != null && !all.hasError() && !all.getOrThrow().isEmpty(); + } + + @Override + public Result autoCreateSebClientConfigurationForIntitution(final Long institutionId) { + return Result.tryCatch(() -> { + final Institution institution = this.institutionDAO + .byPK(institutionId) + .getOrThrow(); + + return new SebClientConfig( + null, + institutionId, + institution.name + "_" + UUID.randomUUID(), + null, + true); + }) + .flatMap(this.sebClientConfigDAO::createNew); + } + + @Override + public Result exportSebClientConfigurationOfInstitution(final Long institutionId) { + return this.sebClientConfigDAO.all(institutionId, true) + .flatMap(l -> l.stream() + .sorted((sc1, sc2) -> sc1.date.compareTo(sc2.date)) + .findFirst() + .or(() -> Optional.of( + autoCreateSebClientConfigurationForIntitution(institutionId).getOrThrow())) + .map(this::createExport) + .get()); + } + + private final static String SEB_CLIENT_CONFIG_EXAMPLE_XML = + "" + + "" + + "%s" + + "%s" + + "%s" + + "%s" + + "" + + ""; + + private final Result createExport(final SebClientConfig config) { + // TODO implementation of creation of SEB client configuration for specified Institution + // A SEB start configuration should at least contain the SEB-Client-Credentials to access the SEB Server API + // and the SEB Server URL + // + // To Clarify : The format of a SEB start configuration + // To Clarify : How the file should be encrypted (use case) maybe we need another encryption-secret for this that can be given by + // an administrator on SEB start configuration creation time + + return Result.tryCatch(() -> { + + final String serverURL = UriComponentsBuilder.newInstance() + .scheme(this.httpScheme) + .host(this.serverAddress) + .port(this.serverPort) + .path(this.sebClientAPIEndpoint) + .toUriString(); + + final ClientCredentials sebClientCredentials = this.sebClientConfigDAO + .getSebClientCredentials(config.getModelId()) + .getOrThrow(); + + final CharSequence plainClientId = this.clientCredentialService + .getPlainClientId(sebClientCredentials); + final CharSequence plainClientSecret = this.clientCredentialService + .getPlainClientSecret(sebClientCredentials); + + try { + return new ByteArrayInputStream( + String.format( + SEB_CLIENT_CONFIG_EXAMPLE_XML, + serverURL, + String.valueOf(config.institutionId), + plainClientId, + plainClientSecret) + .getBytes("UTF-8")); + } catch (final UnsupportedEncodingException e) { + throw new RuntimeException("cause: ", e); + } + + }); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/InstitutionController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/InstitutionController.java index 5ffa1853..abdd1313 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/InstitutionController.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/InstitutionController.java @@ -8,13 +8,23 @@ package ch.ethz.seb.sebserver.webservice.weblayer.api; +import java.io.InputStream; + +import javax.servlet.http.HttpServletResponse; + +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.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.POSTMapper; +import ch.ethz.seb.sebserver.gbl.authorization.PrivilegeType; import ch.ethz.seb.sebserver.gbl.model.institution.Institution; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.InstitutionRecordDynamicSqlSupport; @@ -24,6 +34,7 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.SEBServerUser import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionService; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.InstitutionDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.seb.SebClientConfigService; import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationService; @WebServiceProfile @@ -32,6 +43,7 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationSe public class InstitutionController extends ActivatableEntityController { private final InstitutionDAO institutionDAO; + private final SebClientConfigService sebClientConfigService; public InstitutionController( final InstitutionDAO institutionDAO, @@ -39,7 +51,8 @@ public class InstitutionController 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; -// }); -// } - - public static final class SEBClientAuth { - - @NotNull(message = "lmsSetup:sebClientname:notNull") - @Size(min = 3, max = 255, message = "lmsSetup:sebClientname:size:{min}:{max}:${validatedValue}") - public final String sebAuthName; - - @NotNull(message = "lmsSetup:sebClientsecret:notNull") - @Size(min = 8, max = 255, message = "lmsSetup:sebClientsecret:size:{min}:{max}:${validatedValue}") - public final String sebAuthSecret; - - protected SEBClientAuth(final String authName, final String authSecret) { - - this.sebAuthName = authName; - this.sebAuthSecret = authSecret; - } - } - } diff --git a/src/main/resources/config/application-dev-ws.properties b/src/main/resources/config/application-dev-ws.properties index 2f962d72..a1984536 100644 --- a/src/main/resources/config/application-dev-ws.properties +++ b/src/main/resources/config/application-dev-ws.properties @@ -9,6 +9,7 @@ spring.datasource.driver-class-name=org.mariadb.jdbc.Driver spring.datasource.platform=dev spring.datasource.hikari.max-lifetime=600000 +sebserver.webservice.http.scheme=http sebserver.webservice.api.admin.endpoint=/admin-api/v1 sebserver.webservice.api.admin.accessTokenValiditySeconds=1800 sebserver.webservice.api.admin.refreshTokenValiditySeconds=-1 diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 522aedb7..68a23be2 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -77,7 +77,7 @@ sebserver.institution.action.save=Save Institution sebserver.institution.action.activate=Active sebserver.institution.action.deactivate=Active sebserver.institution.action.delete=Delete Institution - +sebserver.institution.action.export.sebconfig=SEB Client Config sebserver.institution.info.pleaseSelect=Please Select an Institution first. sebserver.institution.form.title.new=New Institution @@ -163,7 +163,6 @@ sebserver.lmssetup.action.save=Save LMS Setup sebserver.lmssetup.action.activate=Active sebserver.lmssetup.action.deactivate=Active sebserver.lmssetup.action.delete=Delete LMS Setup -sebserver.lmssetup.action.export.sebconfig=Export SEB-Client Config sebserver.lmssetup.info.pleaseSelect=Please Select a LMS Setup first diff --git a/src/main/resources/schema-demo.sql b/src/main/resources/schema-demo.sql index 6577dedb..28e27546 100644 --- a/src/main/resources/schema-demo.sql +++ b/src/main/resources/schema-demo.sql @@ -29,8 +29,8 @@ CREATE TABLE IF NOT EXISTS `lms_setup` ( `name` VARCHAR(255) NOT NULL, `lms_type` VARCHAR(45) NOT NULL, `lms_url` VARCHAR(255) NULL, - `lms_clientname` VARCHAR(255) NULL, - `lms_clientsecret` VARCHAR(255) NULL, + `lms_clientname` VARCHAR(4000) NULL, + `lms_clientsecret` VARCHAR(4000) NULL, `lms_rest_api_token` VARCHAR(4000) NULL, `active` INT(1) NOT NULL, PRIMARY KEY (`id`), @@ -400,20 +400,21 @@ CREATE TABLE IF NOT EXISTS `additional_attributes` ( -- ----------------------------------------------------- --- Table `seb_client_credentials` +-- Table `seb_client_configuration` -- ----------------------------------------------------- +DROP TABLE IF EXISTS `seb_client_configuration` ; -CREATE TABLE IF NOT EXISTS `seb_client_credentials` ( +CREATE TABLE IF NOT EXISTS `seb_client_configuration` ( `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, + `client_name` VARCHAR(4000) NOT NULL, + `client_secret` VARCHAR(4000) NOT NULL, `active` INT(1) NOT NULL, PRIMARY KEY (`id`), INDEX `sebClientCredentialsInstitutionRef_idx` (`institution_id` ASC), - CONSTRAINT `sebClientCredentialsInstitutionRef` + CONSTRAINT `sebClientConfigInstitutionRef` FOREIGN KEY (`institution_id`) REFERENCES `institution` (`id`) ON DELETE NO ACTION diff --git a/src/main/resources/schema-dev.sql b/src/main/resources/schema-dev.sql index b49c95df..8abbc24e 100644 --- a/src/main/resources/schema-dev.sql +++ b/src/main/resources/schema-dev.sql @@ -35,8 +35,8 @@ CREATE TABLE IF NOT EXISTS `lms_setup` ( `name` VARCHAR(255) NOT NULL, `lms_type` VARCHAR(45) NOT NULL, `lms_url` VARCHAR(255) NULL, - `lms_clientname` VARCHAR(255) NULL, - `lms_clientsecret` VARCHAR(255) NULL, + `lms_clientname` VARCHAR(4000) NULL, + `lms_clientsecret` VARCHAR(4000) NULL, `lms_rest_api_token` VARCHAR(4000) NULL, `active` INT(1) NOT NULL, PRIMARY KEY (`id`), @@ -423,21 +423,21 @@ CREATE TABLE IF NOT EXISTS `additional_attributes` ( -- ----------------------------------------------------- --- Table `seb_client_credentials` +-- Table `seb_client_configuration` -- ----------------------------------------------------- -DROP TABLE IF EXISTS `seb_client_credentials` ; +DROP TABLE IF EXISTS `seb_client_configuration` ; -CREATE TABLE IF NOT EXISTS `seb_client_credentials` ( +CREATE TABLE IF NOT EXISTS `seb_client_configuration` ( `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, + `client_name` VARCHAR(4000) NOT NULL, + `client_secret` VARCHAR(4000) NOT NULL, `active` INT(1) NOT NULL, PRIMARY KEY (`id`), INDEX `sebClientCredentialsInstitutionRef_idx` (`institution_id` ASC), - CONSTRAINT `sebClientCredentialsInstitutionRef` + CONSTRAINT `sebClientConfigInstitutionRef` FOREIGN KEY (`institution_id`) REFERENCES `institution` (`id`) ON DELETE NO ACTION diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/InternalEncryptionServiceTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/InternalEncryptionServiceTest.java deleted file mode 100644 index a6a179d7..00000000 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/InternalEncryptionServiceTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -package ch.ethz.seb.sebserver.webservice.servicelayer; - -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import org.junit.Test; -import org.springframework.core.env.Environment; - -public class InternalEncryptionServiceTest { - - @Test - public void testEncryptSimpleSecret() { - final Environment envMock = mock(Environment.class); - when(envMock.getRequiredProperty(InternalEncryptionService.SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY)) - .thenReturn("secret1"); - - final InternalEncryptionService service = new InternalEncryptionService(envMock); - final String encrypt = service.encrypt("text1"); - final String decrypt = service.decrypt(encrypt); - assertEquals("text1", decrypt); - } - -} diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentialServiceTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentialServiceTest.java new file mode 100644 index 00000000..df63ad32 --- /dev/null +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentialServiceTest.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.servicelayer.client; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import org.junit.Test; +import org.springframework.core.env.Environment; + +public class ClientCredentialServiceTest { + +// @Test +// public void testEncryptSimpleSecret() { +// final Environment envMock = mock(Environment.class); +// when(envMock.getRequiredProperty(ClientCredentialService.SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY)) +// .thenReturn("secret1"); +// +// final ClientCredentialService service = new ClientCredentialService(envMock); +// final String encrypt = service.encrypt("text1"); +// final String decrypt = service.decrypt(encrypt); +// assertEquals("text1", decrypt); +// } + + @Test + public void testEncryptDecryptClientCredentials() { + final Environment envMock = mock(Environment.class); + when(envMock.getRequiredProperty(ClientCredentialService.SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY)) + .thenReturn("secret1"); + + final String clientName = "simpleClientName"; + + final ClientCredentialService service = new ClientCredentialService(envMock); + String encrypted = + service.encrypt(clientName, "secret1", ClientCredentialService.DEFAULT_SALT).toString(); + String decrypted = service.decrypt(encrypted, "secret1", ClientCredentialService.DEFAULT_SALT).toString(); + + assertEquals(clientName, decrypted); + + final String clientSecret = "fbjreij39ru29305ruࣣàèLöäöäü65%(/%(ç87"; + + encrypted = + service.encrypt(clientSecret, "secret1", ClientCredentialService.DEFAULT_SALT).toString(); + decrypted = service.decrypt(encrypted, "secret1", ClientCredentialService.DEFAULT_SALT).toString(); + + assertEquals(clientSecret, decrypted); + } + +} diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties index 7ff71ccf..5bbbaa28 100644 --- a/src/test/resources/application-test.properties +++ b/src/test/resources/application-test.properties @@ -8,6 +8,7 @@ spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_ spring.datasource.driver-class-name=org.h2.Driver spring.datasource.platform=test +sebserver.webservice.http.scheme=http sebserver.webservice.api.admin.clientId=testClient sebserver.webservice.api.admin.clientSecret=testClient sebserver.webservice.api.admin.endpoint=/admin-api diff --git a/src/test/resources/schema-test.sql b/src/test/resources/schema-test.sql index e0206999..f552a821 100644 --- a/src/test/resources/schema-test.sql +++ b/src/test/resources/schema-test.sql @@ -31,8 +31,8 @@ CREATE TABLE IF NOT EXISTS `lms_setup` ( `name` VARCHAR(255) NOT NULL, `lms_type` VARCHAR(45) NOT NULL, `lms_url` VARCHAR(255) NULL, - `lms_clientname` VARCHAR(255) NULL, - `lms_clientsecret` VARCHAR(255) NULL, + `lms_clientname` VARCHAR(4000) NULL, + `lms_clientsecret` VARCHAR(4000) NULL, `lms_rest_api_token` VARCHAR(4000) NULL, `active` INT(1) NOT NULL, PRIMARY KEY (`id`), @@ -417,23 +417,22 @@ CREATE TABLE IF NOT EXISTS `additional_attributes` ( PRIMARY KEY (`id`)) ; - -- ----------------------------------------------------- --- Table `seb_client_credentials` +-- Table `seb_client_configuration` -- ----------------------------------------------------- -DROP TABLE IF EXISTS `seb_client_credentials` ; +DROP TABLE IF EXISTS `seb_client_configuration` ; -CREATE TABLE IF NOT EXISTS `seb_client_credentials` ( +CREATE TABLE IF NOT EXISTS `seb_client_configuration` ( `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, + `client_name` VARCHAR(4000) NOT NULL, + `client_secret` VARCHAR(4000) NOT NULL, `active` INT(1) NOT NULL, PRIMARY KEY (`id`), INDEX `sebClientCredentialsInstitutionRef_idx` (`institution_id` ASC), - CONSTRAINT `sebClientCredentialsInstitutionRef` + CONSTRAINT `sebClientConfigInstitutionRef` FOREIGN KEY (`institution_id`) REFERENCES `institution` (`id`) ON DELETE NO ACTION