From 60a997d6f664a2fe4d40c44690fdf538b794bd5d Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 18 Jul 2019 12:35:36 +0200 Subject: [PATCH] SEBSERV-63 added fallback URL, config changes --- .../ethz/seb/sebserver/WebSecurityConfig.java | 8 +- .../seb/sebserver/gbl/api/EntityType.java | 2 +- .../ethz/seb/sebserver/gbl/model/Domain.java | 2 +- .../seb/sebserver/gbl/model/exam/Exam.java | 14 +- .../gbl/model/sebconfig/SebClientConfig.java | 16 ++ .../ch/ethz/seb/sebserver/gbl/util/Utils.java | 5 + ...InstitutionalAuthenticationEntryPoint.java | 5 +- .../gui/content/SebClientConfigForm.java | 6 + .../impl/AbstractTableFieldBuilder.java | 8 +- .../session/ClientConnectionTable.java | 85 ++++++++-- .../sebserver/gui/widget/WidgetFactory.java | 6 + .../sebserver/webservice/WebServiceInit.java | 7 +- .../sebserver/webservice/WebserviceInfo.java | 143 +++++++++++++++++ ...onalAttributeRecordDynamicSqlSupport.java} | 32 ++-- ...a => AdditionalAttributeRecordMapper.java} | 92 +++++------ ...ientConnectionRecordDynamicSqlSupport.java | 20 +-- .../mapper/ClientConnectionRecordMapper.java | 36 ++--- .../ClientEventRecordDynamicSqlSupport.java | 16 +- .../batis/mapper/ClientEventRecordMapper.java | 36 ++--- ...ationAttributeRecordDynamicSqlSupport.java | 20 +-- .../ConfigurationAttributeRecordMapper.java | 36 ++--- ...figurationNodeRecordDynamicSqlSupport.java | 20 +-- .../mapper/ConfigurationNodeRecordMapper.java | 36 ++--- .../ConfigurationRecordDynamicSqlSupport.java | 16 +- .../mapper/ConfigurationRecordMapper.java | 36 ++--- ...igurationValueRecordDynamicSqlSupport.java | 16 +- .../ConfigurationValueRecordMapper.java | 36 ++--- ...nfigurationMapRecordDynamicSqlSupport.java | 16 +- .../ExamConfigurationMapRecordMapper.java | 36 ++--- .../mapper/ExamRecordDynamicSqlSupport.java | 24 +-- .../batis/mapper/ExamRecordMapper.java | 36 ++--- .../IndicatorRecordDynamicSqlSupport.java | 14 +- .../batis/mapper/IndicatorRecordMapper.java | 36 ++--- .../InstitutionRecordDynamicSqlSupport.java | 16 +- .../batis/mapper/InstitutionRecordMapper.java | 36 ++--- .../LmsSetupRecordDynamicSqlSupport.java | 22 +-- .../batis/mapper/LmsSetupRecordMapper.java | 36 ++--- .../OrientationRecordDynamicSqlSupport.java | 24 +-- .../batis/mapper/OrientationRecordMapper.java | 36 ++--- .../mapper/RoleRecordDynamicSqlSupport.java | 10 +- .../batis/mapper/RoleRecordMapper.java | 36 ++--- ...ebClientConfigRecordDynamicSqlSupport.java | 20 +-- .../mapper/SebClientConfigRecordMapper.java | 36 ++--- .../ThresholdRecordDynamicSqlSupport.java | 12 +- .../batis/mapper/ThresholdRecordMapper.java | 36 ++--- ...serActivityLogRecordDynamicSqlSupport.java | 18 +-- .../mapper/UserActivityLogRecordMapper.java | 36 ++--- .../mapper/UserRecordDynamicSqlSupport.java | 24 +-- .../batis/mapper/UserRecordMapper.java | 36 ++--- .../mapper/ViewRecordDynamicSqlSupport.java | 12 +- .../batis/mapper/ViewRecordMapper.java | 36 ++--- ...iceServerInfoRecordDynamicSqlSupport.java} | 24 +-- ... => WebserviceServerInfoRecordMapper.java} | 92 +++++------ ...es.java => AdditionalAttributeRecord.java} | 34 ++-- .../batis/model/ClientConnectionRecord.java | 40 ++--- .../batis/model/ClientEventRecord.java | 46 +++--- .../model/ConfigurationAttributeRecord.java | 40 ++--- .../batis/model/ConfigurationNodeRecord.java | 40 ++--- .../batis/model/ConfigurationRecord.java | 32 ++-- .../batis/model/ConfigurationValueRecord.java | 32 ++-- .../model/ExamConfigurationMapRecord.java | 32 ++-- .../datalayer/batis/model/ExamRecord.java | 48 +++--- .../batis/model/IndicatorRecord.java | 28 ++-- .../batis/model/InstitutionRecord.java | 32 ++-- .../datalayer/batis/model/LmsSetupRecord.java | 44 +++--- .../batis/model/OrientationRecord.java | 48 +++--- .../datalayer/batis/model/RoleRecord.java | 20 +-- .../batis/model/SebClientConfigRecord.java | 40 ++--- .../batis/model/ThresholdRecord.java | 24 +-- .../batis/model/UserActivityLogRecord.java | 36 ++--- .../datalayer/batis/model/UserRecord.java | 48 +++--- .../datalayer/batis/model/ViewRecord.java | 24 +-- ...o.java => WebserviceServerInfoRecord.java} | 26 ++-- .../dao/AdditionalAttributesDAO.java | 35 +++++ .../dao/impl/AdditionalAttributesDAOImpl.java | 146 ++++++++++++++++++ .../dao/impl/SebClientConfigDAOImpl.java | 60 +++++-- .../sebconfig/SebClientConfigService.java | 13 +- .../impl/SebClientConfigServiceImpl.java | 97 ++++++------ .../session/PingHandlingStrategy.java | 2 + .../impl/AsyncBatchEventSaveStrategy.java | 11 +- .../impl/DistributedServerPingHandler.java | 47 ++---- .../session/impl/ExamSessionCacheService.java | 40 ++++- .../impl/PingIntervalClientIndicator.java | 3 +- .../impl/SebClientConnectionServiceImpl.java | 5 + .../session/impl/SingleServerPingHandler.java | 5 + .../weblayer/WebServiceSecurityConfig.java | 2 +- .../weblayer/WebServiceShutdown.java | 37 +++++ .../api/ExamAPIDiscoveryController.java | 10 +- .../oauth/CachableJdbcTokenStore.java | 15 +- .../config/application-demo.properties | 4 +- .../config/application-dev-gui.properties | 2 +- .../config/application-dev-ws.properties | 3 +- .../config/application-dev.properties | 2 +- src/main/resources/logback-spring.xml | 5 +- src/main/resources/messages.properties | 1 + src/main/resources/schema-demo.sql | 5 +- src/main/resources/schema-dev.sql | 4 +- .../ch/ethz/seb/sebserver/HTTPClientBot.java | 1 + .../gui/integration/ClientConfigTest.java | 2 + .../api/exam/SebConnectionTest.java | 19 ++- .../resources/application-test.properties | 1 + 101 files changed, 1665 insertions(+), 1141 deletions(-) create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java rename src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/{AdditionalAttributesDynamicSqlSupport.java => AdditionalAttributeRecordDynamicSqlSupport.java} (65%) rename src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/{AdditionalAttributesMapper.java => AdditionalAttributeRecordMapper.java} (76%) rename src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/{WebserviceServerInfoDynamicSqlSupport.java => WebserviceServerInfoRecordDynamicSqlSupport.java} (62%) rename src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/{WebserviceServerInfoMapper.java => WebserviceServerInfoRecordMapper.java} (74%) rename src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/{AdditionalAttributes.java => AdditionalAttributeRecord.java} (77%) rename src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/{WebserviceServerInfo.java => WebserviceServerInfoRecord.java} (77%) create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/AdditionalAttributesDAO.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/AdditionalAttributesDAOImpl.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceShutdown.java diff --git a/src/main/java/ch/ethz/seb/sebserver/WebSecurityConfig.java b/src/main/java/ch/ethz/seb/sebserver/WebSecurityConfig.java index 152e45ea..bbe1d3fe 100644 --- a/src/main/java/ch/ethz/seb/sebserver/WebSecurityConfig.java +++ b/src/main/java/ch/ethz/seb/sebserver/WebSecurityConfig.java @@ -63,10 +63,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter implements E private static final Logger log = LoggerFactory.getLogger(WebSecurityConfig.class); -// @Value("${sebserver.webservice.api.admin.endpoint}") -// private String adminEndpoint; - @Value("${sebserver.webservice.api.redirect.unauthorized}") - private String unauthorizedRedirect; + @Value("${sebserver.webservice.http.redirect.gui}") + private String guiRedirect; @Value("${sebserver.webservice.api.exam.endpoint.discovery}") private String examAPIDiscoveryEndpoint; @@ -109,7 +107,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter implements E @RequestMapping("/error") public void handleError(final HttpServletResponse response) throws IOException { //response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); - response.setHeader(HttpHeaders.LOCATION, this.unauthorizedRedirect); + response.setHeader(HttpHeaders.LOCATION, this.guiRedirect); response.flushBuffer(); } 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 b6da0759..98094364 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-07-15T11:57:33.600+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-07-18T10:59:08.493+02:00") public enum EntityType { CONFIGURATION_ATTRIBUTE, CONFIGURATION_VALUE, diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java index eee3686b..60abb967 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-07-15T11:57:33.521+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-07-18T10:59:08.409+02:00") public interface Domain { interface CONFIGURATION_ATTRIBUTE { diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java index e76dc823..4ebff91a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java @@ -30,6 +30,11 @@ import ch.ethz.seb.sebserver.gbl.model.GrantEntity; @JsonIgnoreProperties(ignoreUnknown = true) public final class Exam implements GrantEntity, Activatable { + // TODO make this a configurable exam attribute + /** The number of hours to add at the start- and end-time of the exam + * To add a expanded time-frame in which the exam state is running on SEB-Server side */ + public static final int EXAM_RUN_TIME_EXPAND_HOURS = 2; + public static final String ATTR_STATUS = "examStatus"; public static final String FILTER_ATTR_TYPE = "type"; @@ -238,9 +243,14 @@ public final class Exam implements GrantEntity, Activatable { return ExamStatus.UP_COMING; } + // expand time frame + final DateTime expStartTime = this.startTime.minusHours(EXAM_RUN_TIME_EXPAND_HOURS); + final DateTime expEndTime = (this.endTime != null) + ? this.endTime.plusHours(EXAM_RUN_TIME_EXPAND_HOURS) : null; + final DateTime now = DateTime.now(DateTimeZone.UTC); - if (this.startTime.isBefore(now)) { - if (this.endTime == null || this.endTime.isAfter(now)) { + if (expStartTime.isBefore(now)) { + if (expEndTime == null || expEndTime.isAfter(now)) { return ExamStatus.RUNNING; } else { return ExamStatus.FINISHED; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/SebClientConfig.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/SebClientConfig.java index 8bc625d5..be3bc3df 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/SebClientConfig.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/SebClientConfig.java @@ -11,6 +11,7 @@ package ch.ethz.seb.sebserver.gbl.model.sebconfig; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; +import org.hibernate.validator.constraints.URL; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -26,6 +27,7 @@ import ch.ethz.seb.sebserver.gbl.model.GrantEntity; public final class SebClientConfig implements GrantEntity, Activatable { + public static final String ATTR_FALLBACK_START_URL = "fallback_start_url"; public static final String ATTR_CONFIRM_ENCRYPT_SECRET = "confirm_encrypt_secret"; public static final String FILTER_ATTR_CREATION_DATE = "creation_date"; @@ -42,6 +44,10 @@ public final class SebClientConfig implements GrantEntity, Activatable { @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_NAME) public final String name; + @JsonProperty(ATTR_FALLBACK_START_URL) + @URL(message = "clientconfig:fallback_start_url:invalidURL") + public final String fallbackStartURL; + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_DATE) public final DateTime date; @@ -58,6 +64,7 @@ public final class SebClientConfig implements GrantEntity, Activatable { @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(ATTR_FALLBACK_START_URL) final String fallbackStartURL, @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_DATE) final DateTime date, @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET) final CharSequence encryptSecret, @JsonProperty(ATTR_CONFIRM_ENCRYPT_SECRET) final CharSequence confirmEncryptSecret, @@ -66,6 +73,7 @@ public final class SebClientConfig implements GrantEntity, Activatable { this.id = id; this.institutionId = institutionId; this.name = name; + this.fallbackStartURL = fallbackStartURL; this.date = date; this.encryptSecret = encryptSecret; this.confirmEncryptSecret = confirmEncryptSecret; @@ -76,6 +84,7 @@ public final class SebClientConfig implements GrantEntity, Activatable { this.id = null; this.institutionId = institutionId; this.name = postParams.getString(Domain.SEB_CLIENT_CONFIGURATION.ATTR_NAME); + this.fallbackStartURL = postParams.getString(ATTR_FALLBACK_START_URL); this.date = postParams.getDateTime(Domain.SEB_CLIENT_CONFIGURATION.ATTR_DATE); this.encryptSecret = postParams.getCharSequence(Domain.SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET); this.confirmEncryptSecret = postParams.getCharSequence(ATTR_CONFIRM_ENCRYPT_SECRET); @@ -92,6 +101,10 @@ public final class SebClientConfig implements GrantEntity, Activatable { return this.name; } + public String getFallbackStartURL() { + return this.fallbackStartURL; + } + @Override public String getModelId() { return (this.id != null) @@ -143,6 +156,8 @@ public final class SebClientConfig implements GrantEntity, Activatable { builder.append(this.institutionId); builder.append(", name="); builder.append(this.name); + builder.append(", fallbackStartURL="); + builder.append(this.fallbackStartURL); builder.append(", date="); builder.append(this.date); builder.append(", encryptSecret="); @@ -160,6 +175,7 @@ public final class SebClientConfig implements GrantEntity, Activatable { null, institutionId, null, + null, DateTime.now(DateTimeZone.UTC), null, null, diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java index 8379ca97..5864ed06 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java @@ -29,6 +29,7 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -353,4 +354,8 @@ public final class Utils { return (Predicate) FALSE_PREDICATE; } + public static long getMillisecondsNow() { + return DateTime.now(DateTimeZone.UTC).getMillis(); + } + } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java b/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java index 6df7e910..5b49c20b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java @@ -40,18 +40,15 @@ final class InstitutionalAuthenticationEntryPoint implements AuthenticationEntry private static final Logger log = LoggerFactory.getLogger(InstitutionalAuthenticationEntryPoint.class); private final String guiEntryPoint; - private final String guiRedirect; private final WebserviceURIService webserviceURIService; private final ClientHttpRequestFactory clientHttpRequestFactory; protected InstitutionalAuthenticationEntryPoint( @Value("${sebserver.gui.entrypoint}") final String guiEntryPoint, - @Value("${sebserver.webservice.api.redirect.unauthorized}") final String guiRedirect, final WebserviceURIService webserviceURIService, final ClientHttpRequestFactory clientHttpRequestFactory) { this.guiEntryPoint = guiEntryPoint; - this.guiRedirect = guiRedirect; this.webserviceURIService = webserviceURIService; this.clientHttpRequestFactory = clientHttpRequestFactory; } @@ -77,7 +74,7 @@ final class InstitutionalAuthenticationEntryPoint implements AuthenticationEntry } else { request.getSession().removeAttribute(API.PARAM_LOGO_IMAGE); response.setStatus(HttpStatus.UNAUTHORIZED.value()); - response.sendRedirect(this.guiRedirect); + response.sendRedirect(this.guiEntryPoint); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientConfigForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientConfigForm.java index 603f9db4..82e1bbdf 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientConfigForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientConfigForm.java @@ -57,6 +57,8 @@ public class SebClientConfigForm implements TemplateComposer { new LocTextKey("sebserver.clientconfig.form.title"); private static final LocTextKey FORM_NAME_TEXT_KEY = new LocTextKey("sebserver.clientconfig.form.name"); + private static final LocTextKey FORM_FALLBACK_URL_TEXT_KEY = + new LocTextKey("sebserver.clientconfig.form.fallback-url"); private static final LocTextKey FORM_DATE_TEXT_KEY = new LocTextKey("sebserver.clientconfig.form.date"); private static final LocTextKey FORM_ENCRYPT_SECRET_TEXT_KEY = @@ -143,6 +145,10 @@ public class SebClientConfigForm implements TemplateComposer { Domain.SEB_CLIENT_CONFIGURATION.ATTR_NAME, FORM_NAME_TEXT_KEY, clientConfig.name)) + .addField(FormBuilder.text( + SebClientConfig.ATTR_FALLBACK_START_URL, + FORM_FALLBACK_URL_TEXT_KEY, + clientConfig.fallbackStartURL)) .addFieldIf(() -> !isNew, () -> FormBuilder.text( Domain.SEB_CLIENT_CONFIGURATION.ATTR_DATE, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/AbstractTableFieldBuilder.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/AbstractTableFieldBuilder.java index 29e66901..b9882fcf 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/AbstractTableFieldBuilder.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/AbstractTableFieldBuilder.java @@ -44,6 +44,10 @@ public abstract class AbstractTableFieldBuilder implements InputFieldBuilder { private static final Logger log = LoggerFactory.getLogger(AbstractTableFieldBuilder.class); + private static final int ROW_HEIGHT = 20; + private static final int NAV_HEIGHT = 40; + private static final int TABLE_WIDTH_SPACE = 50; + protected final RestService restService; protected final WidgetFactory widgetFactory; protected InputFieldBuilderSupplier inputFieldBuilderSupplier; @@ -70,7 +74,7 @@ public abstract class AbstractTableFieldBuilder implements InputFieldBuilder { tableContext.orientation.width(), tableContext.orientation.height()); - gridData.heightHint = tableContext.orientation.height() * 20 + 40; + gridData.heightHint = tableContext.orientation.height() * ROW_HEIGHT + NAV_HEIGHT; table.setLayoutData(gridData); table.setHeaderVisible(true); table.addListener(SWT.Resize, event -> adaptColumnWidth(table, tableContext)); @@ -100,7 +104,7 @@ public abstract class AbstractTableFieldBuilder implements InputFieldBuilder { final TableContext tableContext) { try { - final int currentTableWidth = table.getClientArea().width - 50; + final int currentTableWidth = table.getClientArea().width - TABLE_WIDTH_SPACE; final TableColumn[] columns = table.getColumns(); final List orientations = tableContext .getColumnAttributes() diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java index b3beda3e..04651445 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java @@ -9,6 +9,7 @@ package ch.ethz.seb.sebserver.gui.service.session; import java.util.Collection; +import java.util.Comparator; import java.util.EnumMap; import java.util.HashMap; import java.util.Map; @@ -24,8 +25,6 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; @@ -40,7 +39,7 @@ import ch.ethz.seb.sebserver.gui.widget.WidgetFactory; public final class ClientConnectionTable { - private static final Logger log = LoggerFactory.getLogger(ClientConnectionTable.class); + private static final int BOTTOM_PADDING = 20; private final static LocTextKey CONNECTION_ID_TEXT_KEY = new LocTextKey("sebserver.monitoring.connection.list.column.id"); @@ -79,9 +78,14 @@ public final class ClientConnectionTable { i++; } - this.table = widgetFactory.tableLocalized(tableRoot); - this.table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - this.table.setLayout(new GridLayout()); + this.table = widgetFactory.tableLocalized(tableRoot, SWT.SINGLE | SWT.V_SCROLL); + final GridLayout gridLayout = new GridLayout(3 + indicators.size(), true); + this.table.setLayout(gridLayout); + final GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); + //gridData.heightHint = 200; + this.table.setLayoutData(gridData); + this.table.setHeaderVisible(true); + this.table.setLinesVisible(true); widgetFactory.tableColumnLocalized( this.table, @@ -97,9 +101,6 @@ public final class ClientConnectionTable { tc.setText(indDef.name); } - this.table.setHeaderVisible(true); - this.table.setLinesVisible(true); - this.color1 = new Color(display, new RGB(0, 255, 0), 100); this.color2 = new Color(display, new RGB(249, 166, 2), 100); this.color3 = new Color(display, new RGB(255, 0, 0), 100); @@ -126,26 +127,33 @@ public final class ClientConnectionTable { } public void updateGUI() { + boolean sort = false; for (final UpdatableTableItem uti : this.tableMapping.values()) { if (uti.tableItem == null) { createTableItem(uti); updateIndicatorValues(uti, false); updateConnectionStatusColor(uti); + sort = true; } else { if (uti.previous_connectionData == null || !uti.connectionData.clientConnection.status .equals(uti.previous_connectionData.clientConnection.status)) { uti.tableItem.setText(0, uti.getConnectionIdentifer()); uti.tableItem.setText(2, uti.getStatusName()); updateConnectionStatusColor(uti); + sort = true; } if (uti.hasStatus(ConnectionStatus.ESTABLISHED)) { - updateIndicatorValues(uti, true); + sort = updateIndicatorValues(uti, true); } } uti.tableItem.getDisplay(); } adaptTableWidth(); + if (sort) { + sortTable(); + } + this.table.getParent().layout(true, true); } private void createTableItem(final UpdatableTableItem uti) { @@ -153,21 +161,39 @@ public final class ClientConnectionTable { uti.tableItem.setText(0, uti.getConnectionIdentifer()); uti.tableItem.setText(1, uti.getConnectionAddress()); uti.tableItem.setText(2, uti.getStatusName()); + uti.tableItem.setData("TABLE_ITEM_DATA", uti); } private void adaptTableWidth() { final Rectangle area = this.table.getParent().getClientArea(); if (this.tableWidth != area.width) { - final int columnWidth = area.width / this.table.getColumnCount(); + final int columnWidth = area.width / this.table.getColumnCount() - 5; for (final TableColumn column : this.table.getColumns()) { column.setWidth(columnWidth); } - this.table.layout(true, true); this.tableWidth = area.width; } + + // update table height + final GridData gridData = (GridData) this.table.getLayoutData(); + gridData.heightHint = area.height - BOTTOM_PADDING; } - private void updateIndicatorValues(final UpdatableTableItem uti, final boolean established) { + private void sortTable() { + System.out.println("************** sortTable"); +// final TableItem[] items = this.table.getItems(); +// Arrays.sort(items, TABLE_COMPARATOR); +// for (final TableItem item : items) { +// final UpdatableTableItem uti = (UpdatableTableItem) item.getData("TABLE_ITEM_DATA"); +// item.dispose(); +// createTableItem(uti); +// updateIndicatorValues(uti, false); +// updateConnectionStatusColor(uti); +// } + } + + private boolean updateIndicatorValues(final UpdatableTableItem uti, final boolean established) { + boolean sort = false; for (final IndicatorValue iv : uti.connectionData.indicatorValues) { final IndicatorData indicatorData = this.indicatorMapping.get(iv.getType()); if (indicatorData != null) { @@ -175,12 +201,16 @@ public final class ClientConnectionTable { uti.tableItem.setText(indicatorData.index, "--"); } else { uti.tableItem.setText(indicatorData.index, String.valueOf(iv.getValue())); - uti.tableItem.setBackground( - indicatorData.index, - this.getColorForValue(indicatorData, iv.getValue())); + final Color newColor = this.getColorForValue(indicatorData, iv.getValue()); + final Color background = uti.tableItem.getBackground(indicatorData.index); + if (newColor != background) { + uti.tableItem.setBackground(indicatorData.index, newColor); + sort = true; + } } } } + return sort; } private void updateConnectionStatusColor(final UpdatableTableItem uti) { @@ -212,6 +242,7 @@ public final class ClientConnectionTable { private static final class UpdatableTableItem { + @SuppressWarnings("unused") final Long connectionId; TableItem tableItem; ClientConnectionData previous_connectionData; @@ -222,6 +253,10 @@ public final class ClientConnectionTable { this.connectionId = connectionId; } + public void update(final TableItem tableItem) { + + } + public String getStatusName() { if (this.connectionData != null && this.connectionData.clientConnection.status != null) { return this.connectionData.clientConnection.status.name(); @@ -260,6 +295,7 @@ public final class ClientConnectionTable { private static final class IndicatorData { final int index; + @SuppressWarnings("unused") final Indicator indicator; final ThresholdColor[] thresholdColor; @@ -288,4 +324,21 @@ public final class ClientConnectionTable { } } + private static final Comparator TABLE_COMPARATOR = new Comparator<>() { + + @Override + public int compare(final TableItem o1, final TableItem o2) { + final String name1 = o1.getText(0); + final String name2 = o2.getText(0); + if (name1 != null) { + return name1.compareTo(name2); + } else if (name2 != null) { + return name2.compareTo(name1); + } else { + return -1; + } + } + + }; + } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java index 1b236035..213a511c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java @@ -370,6 +370,12 @@ public class WidgetFactory { return table; } + public Table tableLocalized(final Composite parent, final int style) { + final Table table = new Table(parent, style); + this.polyglotPageService.injectI18n(table); + return table; + } + public TableColumn tableColumnLocalized( final Table table, final LocTextKey locTextKey) { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/WebServiceInit.java b/src/main/java/ch/ethz/seb/sebserver/webservice/WebServiceInit.java index a4d23302..2bf9720f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/WebServiceInit.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/WebServiceInit.java @@ -44,6 +44,8 @@ public class WebServiceInit implements ApplicationListener local host name: {}", InetAddress.getLocalHost().getHostName()); log.info("----> remote host address: {}", InetAddress.getLoopbackAddress().getHostAddress()); - log.info("----> remote host address: {}", InetAddress.getLoopbackAddress().getHostName()); + log.info("----> remote host name: {}", InetAddress.getLoopbackAddress().getHostName()); } catch (final UnknownHostException e) { log.error("Unknown Host: ", e); } + log.info("{}", this.webserviceInfo); + // TODO whatever has to be initialized for the web-service component right after startup comes here } @@ -79,4 +83,5 @@ public class WebServiceInit implements ApplicationListener id = additionalAttributes.id; + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.id") + public static final SqlColumn id = additionalAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.entity_type") - public static final SqlColumn entityType = additionalAttributes.entityType; + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.694+02:00", comments="Source field: additional_attributes.entity_type") + public static final SqlColumn entityType = additionalAttributeRecord.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.entity_id") - public static final SqlColumn entityId = additionalAttributes.entityId; + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.694+02:00", comments="Source field: additional_attributes.entity_id") + public static final SqlColumn entityId = additionalAttributeRecord.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.name") - public static final SqlColumn name = additionalAttributes.name; + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.694+02:00", comments="Source field: additional_attributes.name") + public static final SqlColumn name = additionalAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source field: additional_attributes.value") - public static final SqlColumn value = additionalAttributes.value; + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.694+02:00", comments="Source field: additional_attributes.value") + public static final SqlColumn value = additionalAttributeRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source Table: additional_attributes") - public static final class AdditionalAttributes extends SqlTable { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source Table: additional_attributes") + public static final class AdditionalAttributeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); public final SqlColumn entityType = column("entity_type", JDBCType.VARCHAR); @@ -36,7 +36,7 @@ public final class AdditionalAttributesDynamicSqlSupport { public final SqlColumn value = column("value", JDBCType.VARCHAR); - public AdditionalAttributes() { + public AdditionalAttributeRecord() { super("additional_attributes"); } } 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/AdditionalAttributeRecordMapper.java similarity index 76% rename from src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java index 71cc94f5..a18da7da 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/AdditionalAttributeRecordMapper.java @@ -1,9 +1,9 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper; -import static ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.AdditionalAttributesDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.AdditionalAttributeRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.AdditionalAttributes; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.AdditionalAttributeRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -31,21 +31,21 @@ import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider; import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper -public interface AdditionalAttributesMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") +public interface AdditionalAttributeRecordMapper { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.694+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.694+02:00", comments="Source Table: additional_attributes") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.694+02:00", comments="Source Table: additional_attributes") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) - int insert(InsertStatementProvider insertStatement); + int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -54,9 +54,9 @@ public interface AdditionalAttributesMapper { @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="value", javaType=String.class, jdbcType=JdbcType.VARCHAR) }) - AdditionalAttributes selectOne(SelectStatementProvider selectStatement); + AdditionalAttributeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,35 +65,35 @@ public interface AdditionalAttributesMapper { @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="value", javaType=String.class, jdbcType=JdbcType.VARCHAR) }) - List selectMany(SelectStatementProvider selectStatement); + List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) - .from(additionalAttributes); + .from(additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") default DeleteDSL> deleteByExample() { - return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributes); + return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") default int deleteByPrimaryKey(Long id_) { - return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributes) + return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") - default int insert(AdditionalAttributes record) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") + default int insert(AdditionalAttributeRecord record) { return insert(SqlBuilder.insert(record) - .into(additionalAttributes) + .into(additionalAttributeRecord) .map(entityType).toProperty("entityType") .map(entityId).toProperty("entityId") .map(name).toProperty("name") @@ -102,10 +102,10 @@ public interface AdditionalAttributesMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") - default int insertSelective(AdditionalAttributes record) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") + default int insertSelective(AdditionalAttributeRecord record) { return insert(SqlBuilder.insert(record) - .into(additionalAttributes) + .into(additionalAttributeRecord) .map(entityType).toPropertyWhenPresent("entityType", record::getEntityType) .map(entityId).toPropertyWhenPresent("entityId", record::getEntityId) .map(name).toPropertyWhenPresent("name", record::getName) @@ -114,48 +114,48 @@ public interface AdditionalAttributesMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") - default QueryExpressionDSL>> selectByExample() { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") + default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, entityType, entityId, name, value) - .from(additionalAttributes); + .from(additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") - default QueryExpressionDSL>> selectDistinctByExample() { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") + default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, entityType, entityId, name, value) - .from(additionalAttributes); + .from(additionalAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") - default AdditionalAttributes selectByPrimaryKey(Long id_) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") + default AdditionalAttributeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, entityType, entityId, name, value) - .from(additionalAttributes) + .from(additionalAttributeRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") - default UpdateDSL> updateByExample(AdditionalAttributes record) { - return UpdateDSL.updateWithMapper(this::update, additionalAttributes) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") + default UpdateDSL> updateByExample(AdditionalAttributeRecord record) { + return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalTo(record::getEntityType) .set(entityId).equalTo(record::getEntityId) .set(name).equalTo(record::getName) .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") - default UpdateDSL> updateByExampleSelective(AdditionalAttributes record) { - return UpdateDSL.updateWithMapper(this::update, additionalAttributes) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") + default UpdateDSL> updateByExampleSelective(AdditionalAttributeRecord record) { + return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalToWhenPresent(record::getEntityType) .set(entityId).equalToWhenPresent(record::getEntityId) .set(name).equalToWhenPresent(record::getName) .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") - default int updateByPrimaryKey(AdditionalAttributes record) { - return UpdateDSL.updateWithMapper(this::update, additionalAttributes) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") + default int updateByPrimaryKey(AdditionalAttributeRecord record) { + return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalTo(record::getEntityType) .set(entityId).equalTo(record::getEntityId) .set(name).equalTo(record::getName) @@ -165,9 +165,9 @@ public interface AdditionalAttributesMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.835+02:00", comments="Source Table: additional_attributes") - default int updateByPrimaryKeySelective(AdditionalAttributes record) { - return UpdateDSL.updateWithMapper(this::update, additionalAttributes) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.695+02:00", comments="Source Table: additional_attributes") + default int updateByPrimaryKeySelective(AdditionalAttributeRecord record) { + return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) .set(entityType).equalToWhenPresent(record::getEntityType) .set(entityId).equalToWhenPresent(record::getEntityId) .set(name).equalToWhenPresent(record::getName) @@ -184,6 +184,6 @@ public interface AdditionalAttributesMapper { default QueryExpressionDSL>> selectIdsByExample() { return SelectDSL.selectDistinctWithMapper(this::selectIds, id) - .from(additionalAttributes); + .from(additionalAttributeRecord); } } \ No newline at end of file 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 a44b5d37..5c33bdab 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-07-15T11:57:33.762+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.646+02:00", comments="Source Table: client_connection") public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.763+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.646+02:00", comments="Source field: client_connection.id") public static final SqlColumn id = clientConnectionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.763+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.646+02:00", comments="Source field: client_connection.institution_id") public static final SqlColumn institutionId = clientConnectionRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.763+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.646+02:00", comments="Source field: client_connection.exam_id") public static final SqlColumn examId = clientConnectionRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.763+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.647+02:00", comments="Source field: client_connection.status") public static final SqlColumn status = clientConnectionRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.763+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.647+02:00", comments="Source field: client_connection.connection_token") public static final SqlColumn connectionToken = clientConnectionRecord.connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.763+02:00", comments="Source field: client_connection.exam_user_session_identifer") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.647+02:00", comments="Source field: client_connection.exam_user_session_identifer") public static final SqlColumn examUserSessionIdentifer = clientConnectionRecord.examUserSessionIdentifer; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.763+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.647+02:00", comments="Source field: client_connection.client_address") public static final SqlColumn clientAddress = clientConnectionRecord.clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.763+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.647+02:00", comments="Source field: client_connection.virtual_client_address") public static final SqlColumn virtualClientAddress = clientConnectionRecord.virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.763+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.646+02:00", comments="Source Table: client_connection") public static final class ClientConnectionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java index b0b4c121..c56dd09c 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-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.647+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.647+02:00", comments="Source Table: client_connection") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.647+02:00", comments="Source Table: client_connection") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ClientConnectionRecordMapper { }) ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ClientConnectionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02:00", comments="Source Table: client_connection") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02:00", comments="Source Table: client_connection") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02:00", comments="Source Table: client_connection") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02: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-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02: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-07-15T11:57:33.764+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02: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-07-15T11:57:33.765+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionIdentifer, clientAddress, virtualClientAddress) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.765+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionIdentifer, clientAddress, virtualClientAddress) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.765+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.648+02:00", comments="Source Table: client_connection") default ClientConnectionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, status, connectionToken, examUserSessionIdentifer, clientAddress, virtualClientAddress) .from(clientConnectionRecord) @@ -147,7 +147,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.765+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.649+02:00", comments="Source Table: client_connection") default UpdateDSL> updateByExample(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -159,7 +159,7 @@ public interface ClientConnectionRecordMapper { .set(virtualClientAddress).equalTo(record::getVirtualClientAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.765+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.649+02:00", comments="Source Table: client_connection") default UpdateDSL> updateByExampleSelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -171,7 +171,7 @@ public interface ClientConnectionRecordMapper { .set(virtualClientAddress).equalToWhenPresent(record::getVirtualClientAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.765+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.649+02:00", comments="Source Table: client_connection") default int updateByPrimaryKey(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -186,7 +186,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.765+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.649+02:00", comments="Source Table: client_connection") default int updateByPrimaryKeySelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java index 1556c6e0..e1ccbcd8 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,28 +7,28 @@ 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-07-15T11:57:33.769+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.652+02:00", comments="Source Table: client_event") public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.770+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.652+02:00", comments="Source field: client_event.id") public static final SqlColumn id = clientEventRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.770+02:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.652+02:00", comments="Source field: client_event.connection_id") public static final SqlColumn connectionId = clientEventRecord.connectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.770+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.652+02:00", comments="Source field: client_event.type") public static final SqlColumn type = clientEventRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.770+02:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.652+02:00", comments="Source field: client_event.timestamp") public static final SqlColumn timestamp = clientEventRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.770+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.652+02:00", comments="Source field: client_event.numeric_value") public static final SqlColumn numericValue = clientEventRecord.numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.770+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.652+02:00", comments="Source field: client_event.text") public static final SqlColumn text = clientEventRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.770+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.652+02:00", comments="Source Table: client_event") public static final class ClientEventRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java index d24c8511..ffbada6e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java @@ -32,19 +32,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientEventRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.770+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.770+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.771+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") @InsertProvider(type=SqlProviderAdapter.class, method="insert") int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.771+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface ClientEventRecordMapper { }) ClientEventRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.771+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -68,22 +68,22 @@ public interface ClientEventRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord) .where(id, isEqualTo(id_)) @@ -91,7 +91,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") default int insert(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -105,7 +105,7 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") default int insertSelective(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -119,19 +119,19 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, type, timestamp, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, type, timestamp, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.653+02:00", comments="Source Table: client_event") default ClientEventRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, type, timestamp, numericValue, text) .from(clientEventRecord) @@ -140,7 +140,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.654+02:00", comments="Source Table: client_event") default UpdateDSL> updateByExample(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(id).equalTo(record::getId) @@ -151,7 +151,7 @@ public interface ClientEventRecordMapper { .set(text).equalTo(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.654+02:00", comments="Source Table: client_event") default UpdateDSL> updateByExampleSelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(id).equalToWhenPresent(record::getId) @@ -162,7 +162,7 @@ public interface ClientEventRecordMapper { .set(text).equalToWhenPresent(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.654+02:00", comments="Source Table: client_event") default int updateByPrimaryKey(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalTo(record::getConnectionId) @@ -175,7 +175,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.772+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.654+02: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 0a9b3a45..6e5cbfd2 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-07-15T11:57:33.480+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.358+02:00", comments="Source Table: configuration_attribute") public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.484+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.363+02:00", comments="Source field: configuration_attribute.id") public static final SqlColumn id = configurationAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.485+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.364+02:00", comments="Source field: configuration_attribute.name") public static final SqlColumn name = configurationAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.485+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.364+02:00", comments="Source field: configuration_attribute.type") public static final SqlColumn type = configurationAttributeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.486+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.365+02:00", comments="Source field: configuration_attribute.parent_id") public static final SqlColumn parentId = configurationAttributeRecord.parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.486+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.365+02:00", comments="Source field: configuration_attribute.resources") public static final SqlColumn resources = configurationAttributeRecord.resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.486+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.365+02:00", comments="Source field: configuration_attribute.validator") public static final SqlColumn validator = configurationAttributeRecord.validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.486+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.365+02:00", comments="Source field: configuration_attribute.dependencies") public static final SqlColumn dependencies = configurationAttributeRecord.dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.487+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.365+02:00", comments="Source field: configuration_attribute.default_value") public static final SqlColumn defaultValue = configurationAttributeRecord.defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.484+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.362+02:00", comments="Source Table: configuration_attribute") public static final class ConfigurationAttributeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java index 2718cfdc..d9c731a4 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-07-15T11:57:33.489+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.367+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.491+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.370+02:00", comments="Source Table: configuration_attribute") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.492+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.371+02:00", comments="Source Table: configuration_attribute") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.494+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.374+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationAttributeRecordMapper { }) ConfigurationAttributeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.495+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.376+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ConfigurationAttributeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.496+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.377+02:00", comments="Source Table: configuration_attribute") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.497+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.378+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.498+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.379+02:00", comments="Source Table: configuration_attribute") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.498+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.379+02:00", comments="Source Table: configuration_attribute") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.499+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.380+02:00", comments="Source Table: configuration_attribute") default int insert(ConfigurationAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationAttributeRecord) @@ -111,7 +111,7 @@ public interface ConfigurationAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.501+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.382+02:00", comments="Source Table: configuration_attribute") default int insertSelective(ConfigurationAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationAttributeRecord) @@ -126,19 +126,19 @@ public interface ConfigurationAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.502+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.384+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.503+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.385+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.504+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.386+02:00", comments="Source Table: configuration_attribute") default ConfigurationAttributeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord) @@ -147,7 +147,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.505+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.387+02:00", comments="Source Table: configuration_attribute") default UpdateDSL> updateByExample(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalTo(record::getName) @@ -159,7 +159,7 @@ public interface ConfigurationAttributeRecordMapper { .set(defaultValue).equalTo(record::getDefaultValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.507+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.388+02:00", comments="Source Table: configuration_attribute") default UpdateDSL> updateByExampleSelective(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalToWhenPresent(record::getName) @@ -171,7 +171,7 @@ public interface ConfigurationAttributeRecordMapper { .set(defaultValue).equalToWhenPresent(record::getDefaultValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.507+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.390+02:00", comments="Source Table: configuration_attribute") default int updateByPrimaryKey(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalTo(record::getName) @@ -186,7 +186,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.508+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.391+02:00", comments="Source Table: configuration_attribute") default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java index fba43341..16833472 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-07-15T11:57:33.715+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.626+02:00", comments="Source Table: configuration_node") public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.715+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.626+02:00", comments="Source field: configuration_node.id") public static final SqlColumn id = configurationNodeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.716+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.626+02:00", comments="Source field: configuration_node.institution_id") public static final SqlColumn institutionId = configurationNodeRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.716+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.626+02:00", comments="Source field: configuration_node.template_id") public static final SqlColumn templateId = configurationNodeRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.716+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.626+02:00", comments="Source field: configuration_node.owner") public static final SqlColumn owner = configurationNodeRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.716+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.626+02:00", comments="Source field: configuration_node.name") public static final SqlColumn name = configurationNodeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.717+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.627+02:00", comments="Source field: configuration_node.description") public static final SqlColumn description = configurationNodeRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.720+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.627+02:00", comments="Source field: configuration_node.type") public static final SqlColumn type = configurationNodeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.720+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.627+02:00", comments="Source field: configuration_node.status") public static final SqlColumn status = configurationNodeRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.715+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.626+02:00", comments="Source Table: configuration_node") public static final class ConfigurationNodeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java index 6a2de37a..3555265d 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-07-15T11:57:33.720+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.627+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.720+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.627+02:00", comments="Source Table: configuration_node") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.721+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.627+02:00", comments="Source Table: configuration_node") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.721+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.627+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationNodeRecordMapper { }) ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.721+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.627+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ConfigurationNodeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.722+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.628+02:00", comments="Source Table: configuration_node") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.722+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.628+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.722+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.628+02:00", comments="Source Table: configuration_node") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.722+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.628+02:00", comments="Source Table: configuration_node") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.723+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.628+02:00", comments="Source Table: configuration_node") default int insert(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -111,7 +111,7 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.723+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.628+02:00", comments="Source Table: configuration_node") default int insertSelective(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -126,19 +126,19 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.723+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.628+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.723+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.629+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.723+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.629+02:00", comments="Source Table: configuration_node") default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord) @@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.729+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.629+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExample(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -159,7 +159,7 @@ public interface ConfigurationNodeRecordMapper { .set(status).equalTo(record::getStatus); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.730+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.629+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExampleSelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -171,7 +171,7 @@ public interface ConfigurationNodeRecordMapper { .set(status).equalToWhenPresent(record::getStatus); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.730+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.629+02:00", comments="Source Table: configuration_node") default int updateByPrimaryKey(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -186,7 +186,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.730+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.629+02:00", comments="Source Table: configuration_node") default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java index 794a2393..bafb9dd5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java @@ -7,28 +7,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.706+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.622+02:00", comments="Source Table: configuration") public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.706+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.622+02:00", comments="Source field: configuration.id") public static final SqlColumn id = configurationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.707+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.622+02:00", comments="Source field: configuration.institution_id") public static final SqlColumn institutionId = configurationRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.708+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.622+02:00", comments="Source field: configuration.configuration_node_id") public static final SqlColumn configurationNodeId = configurationRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.708+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.622+02:00", comments="Source field: configuration.version") public static final SqlColumn version = configurationRecord.version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.708+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.622+02:00", comments="Source field: configuration.version_date") public static final SqlColumn versionDate = configurationRecord.versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.708+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source field: configuration.followup") public static final SqlColumn followup = configurationRecord.followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.706+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.622+02:00", comments="Source Table: configuration") public static final class ConfigurationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java index 1a9119cb..2cb498d7 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-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationRecordMapper { }) ConfigurationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface ConfigurationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") default int insert(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -107,7 +107,7 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.710+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.623+02:00", comments="Source Table: configuration") default int insertSelective(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -120,19 +120,19 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.711+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.624+02:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.711+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.624+02:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.711+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.624+02:00", comments="Source Table: configuration") default ConfigurationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord) @@ -141,7 +141,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.711+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.624+02:00", comments="Source Table: configuration") default UpdateDSL> updateByExample(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -151,7 +151,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalTo(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.711+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.624+02:00", comments="Source Table: configuration") default UpdateDSL> updateByExampleSelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -161,7 +161,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalToWhenPresent(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.711+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.624+02:00", comments="Source Table: configuration") default int updateByPrimaryKey(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -174,7 +174,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.712+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.624+02:00", comments="Source Table: configuration") default int updateByPrimaryKeySelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java index 87862ae1..d5c1d16d 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-07-15T11:57:33.674+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.602+02:00", comments="Source Table: configuration_value") public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.675+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.602+02:00", comments="Source field: configuration_value.id") public static final SqlColumn id = configurationValueRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.675+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.602+02:00", comments="Source field: configuration_value.institution_id") public static final SqlColumn institutionId = configurationValueRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.675+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.603+02:00", comments="Source field: configuration_value.configuration_id") public static final SqlColumn configurationId = configurationValueRecord.configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.675+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.603+02:00", comments="Source field: configuration_value.configuration_attribute_id") public static final SqlColumn configurationAttributeId = configurationValueRecord.configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.675+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.603+02:00", comments="Source field: configuration_value.list_index") public static final SqlColumn listIndex = configurationValueRecord.listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.675+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.603+02:00", comments="Source field: configuration_value.value") public static final SqlColumn value = configurationValueRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.675+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.602+02:00", comments="Source Table: configuration_value") public static final class ConfigurationValueRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java index bea25802..57154c44 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java @@ -31,19 +31,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationValueRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.676+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.603+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.676+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.603+02:00", comments="Source Table: configuration_value") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.676+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.603+02:00", comments="Source Table: configuration_value") @InsertProvider(type=SqlProviderAdapter.class, method="insert") int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.676+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.603+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -55,7 +55,7 @@ public interface ConfigurationValueRecordMapper { }) ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.676+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface ConfigurationValueRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.676+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.676+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.676+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.676+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.679+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") default int insert(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -104,7 +104,7 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.679+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") default int insertSelective(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -118,19 +118,19 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.679+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.679+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.679+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") default ConfigurationValueRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord) @@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.679+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.604+02:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExample(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(id).equalTo(record::getId) @@ -150,7 +150,7 @@ public interface ConfigurationValueRecordMapper { .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.679+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.605+02:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExampleSelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(id).equalToWhenPresent(record::getId) @@ -161,7 +161,7 @@ public interface ConfigurationValueRecordMapper { .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.679+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.605+02:00", comments="Source Table: configuration_value") default int updateByPrimaryKey(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -174,7 +174,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.680+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.605+02:00", comments="Source Table: configuration_value") default int updateByPrimaryKeySelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java index b0b9cc8d..94861008 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamConfigurationMapRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.742+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.632+02:00", comments="Source Table: exam_configuration_map") public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.742+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.632+02:00", comments="Source field: exam_configuration_map.id") public static final SqlColumn id = examConfigurationMapRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.742+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.633+02:00", comments="Source field: exam_configuration_map.institution_id") public static final SqlColumn institutionId = examConfigurationMapRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.742+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.633+02:00", comments="Source field: exam_configuration_map.exam_id") public static final SqlColumn examId = examConfigurationMapRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.743+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.633+02:00", comments="Source field: exam_configuration_map.configuration_node_id") public static final SqlColumn configurationNodeId = examConfigurationMapRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.743+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source field: exam_configuration_map.user_names") public static final SqlColumn userNames = examConfigurationMapRecord.userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.743+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source field: exam_configuration_map.encrypt_secret") public static final SqlColumn encryptSecret = examConfigurationMapRecord.encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.742+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.632+02:00", comments="Source Table: exam_configuration_map") public static final class ExamConfigurationMapRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java index 657935e2..748e726e 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-07-15T11:57:33.743+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.743+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source Table: exam_configuration_map") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.743+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source Table: exam_configuration_map") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.743+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ExamConfigurationMapRecordMapper { }) ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.743+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ExamConfigurationMapRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source Table: exam_configuration_map") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source Table: exam_configuration_map") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.634+02:00", comments="Source Table: exam_configuration_map") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.635+02:00", comments="Source Table: exam_configuration_map") default int insert(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -105,7 +105,7 @@ public interface ExamConfigurationMapRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.635+02:00", comments="Source Table: exam_configuration_map") default int insertSelective(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -118,19 +118,19 @@ public interface ExamConfigurationMapRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.635+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.635+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.635+02:00", comments="Source Table: exam_configuration_map") default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) .from(examConfigurationMapRecord) @@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.635+02:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExample(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -149,7 +149,7 @@ public interface ExamConfigurationMapRecordMapper { .set(encryptSecret).equalTo(record::getEncryptSecret); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.744+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.635+02:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExampleSelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -159,7 +159,7 @@ public interface ExamConfigurationMapRecordMapper { .set(encryptSecret).equalToWhenPresent(record::getEncryptSecret); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.751+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.635+02:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKey(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -172,7 +172,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.751+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.635+02:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java index 91586b05..fa7ea78c 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-07-15T11:57:33.756+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.640+02:00", comments="Source Table: exam") public static final ExamRecord examRecord = new ExamRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.756+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.640+02:00", comments="Source field: exam.id") public static final SqlColumn id = examRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.756+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.640+02:00", comments="Source field: exam.institution_id") public static final SqlColumn institutionId = examRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.756+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.641+02:00", comments="Source field: exam.lms_setup_id") public static final SqlColumn lmsSetupId = examRecord.lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.756+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.641+02:00", comments="Source field: exam.external_id") public static final SqlColumn externalId = examRecord.externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.756+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.641+02:00", comments="Source field: exam.owner") public static final SqlColumn owner = examRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.757+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.641+02:00", comments="Source field: exam.supporter") public static final SqlColumn supporter = examRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.757+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.641+02:00", comments="Source field: exam.type") public static final SqlColumn type = examRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.757+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.641+02:00", comments="Source field: exam.quit_password") public static final SqlColumn quitPassword = examRecord.quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.757+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.641+02:00", comments="Source field: exam.browser_keys") public static final SqlColumn browserKeys = examRecord.browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.757+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.642+02:00", comments="Source field: exam.active") public static final SqlColumn active = examRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.756+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.640+02:00", comments="Source Table: exam") public static final class ExamRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java index 510c7e7b..6e3e4cab 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-07-15T11:57:33.757+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.642+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.757+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.642+02:00", comments="Source Table: exam") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.758+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.642+02:00", comments="Source Table: exam") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.758+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.642+02: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-07-15T11:57:33.758+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.642+02: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-07-15T11:57:33.758+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.642+02:00", comments="Source Table: exam") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.758+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.642+02:00", comments="Source Table: exam") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.758+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.642+02:00", comments="Source Table: exam") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.758+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.642+02: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-07-15T11:57:33.758+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.643+02: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-07-15T11:57:33.758+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.643+02: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-07-15T11:57:33.758+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.643+02:00", comments="Source Table: exam") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, active) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.759+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.643+02:00", comments="Source Table: exam") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, active) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.759+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.643+02:00", comments="Source Table: exam") default ExamRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, active) .from(examRecord) @@ -155,7 +155,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.759+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.643+02: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-07-15T11:57:33.759+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.643+02: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-07-15T11:57:33.759+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.643+02: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-07-15T11:57:33.759+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.644+02:00", comments="Source Table: exam") default int updateByPrimaryKeySelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java index 59256dc9..4f862fb4 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-07-15T11:57:33.776+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.655+02:00", comments="Source Table: indicator") public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.656+02:00", comments="Source field: indicator.id") public static final SqlColumn id = indicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.656+02:00", comments="Source field: indicator.exam_id") public static final SqlColumn examId = indicatorRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.656+02:00", comments="Source field: indicator.type") public static final SqlColumn type = indicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.656+02:00", comments="Source field: indicator.name") public static final SqlColumn name = indicatorRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source field: indicator.color") public static final SqlColumn color = indicatorRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.656+02:00", comments="Source Table: indicator") public static final class IndicatorRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java index b19028c1..05161081 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-07-15T11:57:33.776+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface IndicatorRecordMapper { }) IndicatorRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface IndicatorRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") default int insert(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -102,7 +102,7 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") default int insertSelective(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -114,19 +114,19 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.657+02:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, type, name, color) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.658+02:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, type, name, color) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.658+02:00", comments="Source Table: indicator") default IndicatorRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, type, name, color) .from(indicatorRecord) @@ -135,7 +135,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.658+02:00", comments="Source Table: indicator") default UpdateDSL> updateByExample(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -144,7 +144,7 @@ public interface IndicatorRecordMapper { .set(color).equalTo(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.658+02:00", comments="Source Table: indicator") default UpdateDSL> updateByExampleSelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -153,7 +153,7 @@ public interface IndicatorRecordMapper { .set(color).equalToWhenPresent(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.658+02:00", comments="Source Table: indicator") default int updateByPrimaryKey(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -165,7 +165,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.777+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.658+02:00", comments="Source Table: indicator") default int updateByPrimaryKeySelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java index 56996518..209a5a74 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-07-15T11:57:33.784+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.669+02:00", comments="Source Table: institution") public static final InstitutionRecord institutionRecord = new InstitutionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.784+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.670+02:00", comments="Source field: institution.id") public static final SqlColumn id = institutionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.784+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.670+02:00", comments="Source field: institution.name") public static final SqlColumn name = institutionRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.784+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.670+02:00", comments="Source field: institution.url_suffix") public static final SqlColumn urlSuffix = institutionRecord.urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.784+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.671+02:00", comments="Source field: institution.theme_name") public static final SqlColumn themeName = institutionRecord.themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.784+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.671+02:00", comments="Source field: institution.active") public static final SqlColumn active = institutionRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.671+02:00", comments="Source field: institution.logo_image") public static final SqlColumn logoImage = institutionRecord.logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.784+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.670+02:00", comments="Source Table: institution") public static final class InstitutionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java index 79be2402..13a965c7 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-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.671+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.671+02:00", comments="Source Table: institution") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.671+02:00", comments="Source Table: institution") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.671+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface InstitutionRecordMapper { }) InstitutionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.671+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface InstitutionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.672+02:00", comments="Source Table: institution") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.672+02:00", comments="Source Table: institution") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.672+02:00", comments="Source Table: institution") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.672+02:00", comments="Source Table: institution") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.672+02:00", comments="Source Table: institution") default int insert(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -105,7 +105,7 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.672+02:00", comments="Source Table: institution") default int insertSelective(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -118,19 +118,19 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.672+02:00", comments="Source Table: institution") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.785+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.672+02:00", comments="Source Table: institution") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.787+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.672+02:00", comments="Source Table: institution") default InstitutionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord) @@ -139,7 +139,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.788+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.672+02:00", comments="Source Table: institution") default UpdateDSL> updateByExample(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -149,7 +149,7 @@ public interface InstitutionRecordMapper { .set(logoImage).equalTo(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.788+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.673+02:00", comments="Source Table: institution") default UpdateDSL> updateByExampleSelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) @@ -159,7 +159,7 @@ public interface InstitutionRecordMapper { .set(logoImage).equalToWhenPresent(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.788+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.673+02:00", comments="Source Table: institution") default int updateByPrimaryKey(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -172,7 +172,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.788+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.673+02:00", comments="Source Table: institution") default int updateByPrimaryKeySelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java index b0abea30..de5d303c 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-07-15T11:57:33.794+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.678+02:00", comments="Source Table: lms_setup") public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.796+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source field: lms_setup.id") public static final SqlColumn id = lmsSetupRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.796+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source field: lms_setup.institution_id") public static final SqlColumn institutionId = lmsSetupRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.796+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source field: lms_setup.name") public static final SqlColumn name = lmsSetupRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.796+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source field: lms_setup.lms_type") public static final SqlColumn lmsType = lmsSetupRecord.lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.797+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source field: lms_setup.lms_url") public static final SqlColumn lmsUrl = lmsSetupRecord.lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.797+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source field: lms_setup.lms_clientname") public static final SqlColumn lmsClientname = lmsSetupRecord.lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.797+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source field: lms_setup.lms_clientsecret") public static final SqlColumn lmsClientsecret = lmsSetupRecord.lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.797+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source field: lms_setup.lms_rest_api_token") public static final SqlColumn lmsRestApiToken = lmsSetupRecord.lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.797+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source field: lms_setup.active") public static final SqlColumn active = lmsSetupRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source Table: lms_setup") public static final class LmsSetupRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java index b49fc785..2879ae33 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-07-15T11:57:33.797+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.797+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source Table: lms_setup") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.797+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source Table: lms_setup") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.798+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.679+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -60,7 +60,7 @@ public interface LmsSetupRecordMapper { }) LmsSetupRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.798+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface LmsSetupRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.799+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02:00", comments="Source Table: lms_setup") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.799+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02:00", comments="Source Table: lms_setup") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.799+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02:00", comments="Source Table: lms_setup") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.800+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02: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-07-15T11:57:33.800+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02: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-07-15T11:57:33.800+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02: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-07-15T11:57:33.800+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02: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-07-15T11:57:33.800+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02: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-07-15T11:57:33.800+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02:00", comments="Source Table: lms_setup") default LmsSetupRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, active) .from(lmsSetupRecord) @@ -151,7 +151,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.800+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.680+02: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-07-15T11:57:33.800+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02: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-07-15T11:57:33.800+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02: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-07-15T11:57:33.800+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source Table: lms_setup") default int updateByPrimaryKeySelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java index 3a056910..c327b0a6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java @@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class OrientationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.691+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.613+02:00", comments="Source Table: orientation") public static final OrientationRecord orientationRecord = new OrientationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.691+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.614+02:00", comments="Source field: orientation.id") public static final SqlColumn id = orientationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.691+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.614+02:00", comments="Source field: orientation.config_attribute_id") public static final SqlColumn configAttributeId = orientationRecord.configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.691+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.614+02:00", comments="Source field: orientation.template_id") public static final SqlColumn templateId = orientationRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.692+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.614+02:00", comments="Source field: orientation.view_id") public static final SqlColumn viewId = orientationRecord.viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.692+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.614+02:00", comments="Source field: orientation.group_id") public static final SqlColumn groupId = orientationRecord.groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.692+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.615+02:00", comments="Source field: orientation.x_position") public static final SqlColumn xPosition = orientationRecord.xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.692+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.615+02:00", comments="Source field: orientation.y_position") public static final SqlColumn yPosition = orientationRecord.yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.692+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.615+02:00", comments="Source field: orientation.width") public static final SqlColumn width = orientationRecord.width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.692+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.615+02:00", comments="Source field: orientation.height") public static final SqlColumn height = orientationRecord.height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.693+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.615+02:00", comments="Source field: orientation.title") public static final SqlColumn title = orientationRecord.title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.691+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.613+02:00", comments="Source Table: orientation") public static final class OrientationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java index b4e41087..c5d24923 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-07-15T11:57:33.693+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.615+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.693+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.616+02:00", comments="Source Table: orientation") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.693+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.616+02:00", comments="Source Table: orientation") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.693+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.616+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface OrientationRecordMapper { }) OrientationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.693+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.616+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -77,22 +77,22 @@ public interface OrientationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.696+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.618+02:00", comments="Source Table: orientation") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.696+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.618+02:00", comments="Source Table: orientation") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.696+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.618+02:00", comments="Source Table: orientation") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.696+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.618+02:00", comments="Source Table: orientation") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.696+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.618+02:00", comments="Source Table: orientation") default int insert(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -117,7 +117,7 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.696+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.618+02:00", comments="Source Table: orientation") default int insertSelective(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -134,19 +134,19 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.696+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.618+02:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.697+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.619+02:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.697+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.619+02:00", comments="Source Table: orientation") default OrientationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord) @@ -155,7 +155,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.698+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.619+02:00", comments="Source Table: orientation") default UpdateDSL> updateByExample(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -169,7 +169,7 @@ public interface OrientationRecordMapper { .set(title).equalTo(record::getTitle); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.698+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.619+02:00", comments="Source Table: orientation") default UpdateDSL> updateByExampleSelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) @@ -183,7 +183,7 @@ public interface OrientationRecordMapper { .set(title).equalToWhenPresent(record::getTitle); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.698+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.619+02:00", comments="Source Table: orientation") default int updateByPrimaryKey(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -200,7 +200,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.698+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.619+02:00", comments="Source Table: orientation") default int updateByPrimaryKeySelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java index e84bd6e7..282e9886 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-07-15T11:57:33.812+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.688+02:00", comments="Source Table: user_role") public static final RoleRecord roleRecord = new RoleRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.812+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.688+02:00", comments="Source field: user_role.id") public static final SqlColumn id = roleRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.812+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.688+02:00", comments="Source field: user_role.user_id") public static final SqlColumn userId = roleRecord.userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.812+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source field: user_role.role_name") public static final SqlColumn roleName = roleRecord.roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.812+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.688+02:00", comments="Source Table: user_role") public static final class RoleRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java index f14c8e8c..2a2bc417 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-07-15T11:57:33.813+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.813+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.813+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.813+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -54,7 +54,7 @@ public interface RoleRecordMapper { }) RoleRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -63,22 +63,22 @@ public interface RoleRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord) .where(id, isEqualTo(id_)) @@ -86,7 +86,7 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") default int insert(RoleRecord record) { return insert(SqlBuilder.insert(record) .into(roleRecord) @@ -96,7 +96,7 @@ public interface RoleRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") default int insertSelective(RoleRecord record) { return insert(SqlBuilder.insert(record) .into(roleRecord) @@ -106,19 +106,19 @@ public interface RoleRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, userId, roleName) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userId, roleName) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.689+02:00", comments="Source Table: user_role") default RoleRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, userId, roleName) .from(roleRecord) @@ -127,21 +127,21 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source Table: user_role") default UpdateDSL> updateByExample(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalTo(record::getUserId) .set(roleName).equalTo(record::getRoleName); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source Table: user_role") default UpdateDSL> updateByExampleSelective(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalToWhenPresent(record::getUserId) .set(roleName).equalToWhenPresent(record::getRoleName); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source Table: user_role") default int updateByPrimaryKey(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalTo(record::getUserId) @@ -151,7 +151,7 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.814+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source Table: user_role") default int updateByPrimaryKeySelective(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalToWhenPresent(record::getUserId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java index 62286626..39850051 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java @@ -7,34 +7,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class SebClientConfigRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.790+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source Table: seb_client_configuration") public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.790+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.id") public static final SqlColumn id = sebClientConfigRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.790+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source field: seb_client_configuration.institution_id") public static final SqlColumn institutionId = sebClientConfigRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.790+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source field: seb_client_configuration.name") public static final SqlColumn name = sebClientConfigRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.790+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source field: seb_client_configuration.date") public static final SqlColumn date = sebClientConfigRecord.date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.790+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source field: seb_client_configuration.client_name") public static final SqlColumn clientName = sebClientConfigRecord.clientName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.791+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source field: seb_client_configuration.client_secret") public static final SqlColumn clientSecret = sebClientConfigRecord.clientSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.791+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source field: seb_client_configuration.encrypt_secret") public static final SqlColumn encryptSecret = sebClientConfigRecord.encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.791+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source field: seb_client_configuration.active") public static final SqlColumn active = sebClientConfigRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.790+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source Table: seb_client_configuration") public static final class SebClientConfigRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java index a7251500..32286e46 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface SebClientConfigRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.791+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.791+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source Table: seb_client_configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.791+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source Table: seb_client_configuration") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.791+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.675+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface SebClientConfigRecordMapper { }) SebClientConfigRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.791+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface SebClientConfigRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default int insert(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -113,7 +113,7 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default int insertSelective(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -128,19 +128,19 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default SebClientConfigRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord) @@ -149,7 +149,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExample(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -161,7 +161,7 @@ public interface SebClientConfigRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExampleSelective(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -173,7 +173,7 @@ public interface SebClientConfigRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default int updateByPrimaryKey(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -188,7 +188,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.792+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.676+02:00", comments="Source Table: seb_client_configuration") default int updateByPrimaryKeySelective(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java index 72ed7c49..f1fab4e0 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-07-15T11:57:33.780+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.660+02:00", comments="Source Table: threshold") public static final ThresholdRecord thresholdRecord = new ThresholdRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.660+02:00", comments="Source field: threshold.id") public static final SqlColumn id = thresholdRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.660+02:00", comments="Source field: threshold.indicator_id") public static final SqlColumn indicatorId = thresholdRecord.indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.660+02:00", comments="Source field: threshold.value") public static final SqlColumn value = thresholdRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.660+02:00", comments="Source field: threshold.color") public static final SqlColumn color = thresholdRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.660+02:00", comments="Source Table: threshold") public static final class ThresholdRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java index 231e3762..9468e18d 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-07-15T11:57:33.780+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.660+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.661+02:00", comments="Source Table: threshold") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.662+02:00", comments="Source Table: threshold") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.662+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface ThresholdRecordMapper { }) ThresholdRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.663+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -66,22 +66,22 @@ public interface ThresholdRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.663+02:00", comments="Source Table: threshold") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.663+02:00", comments="Source Table: threshold") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.663+02:00", comments="Source Table: threshold") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.663+02:00", comments="Source Table: threshold") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord) .where(id, isEqualTo(id_)) @@ -89,7 +89,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.663+02:00", comments="Source Table: threshold") default int insert(ThresholdRecord record) { return insert(SqlBuilder.insert(record) .into(thresholdRecord) @@ -100,7 +100,7 @@ public interface ThresholdRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.663+02:00", comments="Source Table: threshold") default int insertSelective(ThresholdRecord record) { return insert(SqlBuilder.insert(record) .into(thresholdRecord) @@ -111,19 +111,19 @@ public interface ThresholdRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.664+02:00", comments="Source Table: threshold") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, indicatorId, value, color) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.664+02:00", comments="Source Table: threshold") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, indicatorId, value, color) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.664+02:00", comments="Source Table: threshold") default ThresholdRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, indicatorId, value, color) .from(thresholdRecord) @@ -132,7 +132,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.664+02:00", comments="Source Table: threshold") default UpdateDSL> updateByExample(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalTo(record::getIndicatorId) @@ -140,7 +140,7 @@ public interface ThresholdRecordMapper { .set(color).equalTo(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.781+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.664+02:00", comments="Source Table: threshold") default UpdateDSL> updateByExampleSelective(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalToWhenPresent(record::getIndicatorId) @@ -148,7 +148,7 @@ public interface ThresholdRecordMapper { .set(color).equalToWhenPresent(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.782+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.665+02:00", comments="Source Table: threshold") default int updateByPrimaryKey(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalTo(record::getIndicatorId) @@ -159,7 +159,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.782+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.665+02:00", comments="Source Table: threshold") default int updateByPrimaryKeySelective(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalToWhenPresent(record::getIndicatorId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java index 0305de46..99408413 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-07-15T11:57:33.817+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source Table: user_activity_log") public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.824+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.id") public static final SqlColumn id = userActivityLogRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.829+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.user_uuid") public static final SqlColumn userUuid = userActivityLogRecord.userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.829+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.timestamp") public static final SqlColumn timestamp = userActivityLogRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.829+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.activity_type") public static final SqlColumn activityType = userActivityLogRecord.activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.entity_type") public static final SqlColumn entityType = userActivityLogRecord.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source field: user_activity_log.entity_id") public static final SqlColumn entityId = userActivityLogRecord.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source field: user_activity_log.message") public static final SqlColumn message = userActivityLogRecord.message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.818+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source Table: user_activity_log") public static final class UserActivityLogRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java index cb68c04a..5d3cb5bc 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-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface UserActivityLogRecordMapper { }) UserActivityLogRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface UserActivityLogRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default int insert(UserActivityLogRecord record) { return insert(SqlBuilder.insert(record) .into(userActivityLogRecord) @@ -108,7 +108,7 @@ public interface UserActivityLogRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.832+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default int insertSelective(UserActivityLogRecord record) { return insert(SqlBuilder.insert(record) .into(userActivityLogRecord) @@ -122,19 +122,19 @@ public interface UserActivityLogRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.833+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.833+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.833+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default UserActivityLogRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord) @@ -143,7 +143,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.833+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default UpdateDSL> updateByExample(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalTo(record::getUserUuid) @@ -154,7 +154,7 @@ public interface UserActivityLogRecordMapper { .set(message).equalTo(record::getMessage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.833+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default UpdateDSL> updateByExampleSelective(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalToWhenPresent(record::getUserUuid) @@ -165,7 +165,7 @@ public interface UserActivityLogRecordMapper { .set(message).equalToWhenPresent(record::getMessage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.833+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default int updateByPrimaryKey(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalTo(record::getUserUuid) @@ -179,7 +179,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.833+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.692+02:00", comments="Source Table: user_activity_log") default int updateByPrimaryKeySelective(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalToWhenPresent(record::getUserUuid) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java index 95e92bd7..095aac56 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-07-15T11:57:33.806+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source Table: user") public static final UserRecord userRecord = new UserRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.806+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.id") public static final SqlColumn id = userRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.807+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.institution_id") public static final SqlColumn institutionId = userRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.807+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.uuid") public static final SqlColumn uuid = userRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.807+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.name") public static final SqlColumn name = userRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.807+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.username") public static final SqlColumn username = userRecord.username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.807+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.683+02:00", comments="Source field: user.password") public static final SqlColumn password = userRecord.password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.807+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.683+02:00", comments="Source field: user.email") public static final SqlColumn email = userRecord.email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.807+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.683+02:00", comments="Source field: user.language") public static final SqlColumn language = userRecord.language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.807+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.683+02:00", comments="Source field: user.timezone") public static final SqlColumn timezone = userRecord.timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.808+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.683+02:00", comments="Source field: user.active") public static final SqlColumn active = userRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.806+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source Table: user") public static final class UserRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java index f6f0a9fb..4523fc68 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-07-15T11:57:33.808+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.683+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.808+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.683+02:00", comments="Source Table: user") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.808+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.683+02:00", comments="Source Table: user") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.809+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.684+02: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-07-15T11:57:33.809+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.684+02: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-07-15T11:57:33.809+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.684+02:00", comments="Source Table: user") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.809+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.684+02:00", comments="Source Table: user") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.809+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.684+02:00", comments="Source Table: user") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.809+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.685+02: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-07-15T11:57:33.809+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.685+02: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-07-15T11:57:33.809+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.685+02: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-07-15T11:57:33.810+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.685+02: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-07-15T11:57:33.810+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.685+02: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-07-15T11:57:33.810+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.685+02: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-07-15T11:57:33.810+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.685+02: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-07-15T11:57:33.810+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.685+02: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-07-15T11:57:33.810+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.685+02: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-07-15T11:57:33.810+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.685+02:00", comments="Source Table: user") default int updateByPrimaryKeySelective(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java index af3fe5e7..408ae163 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java @@ -6,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ViewRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.683+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source Table: view") public static final ViewRecord viewRecord = new ViewRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.683+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.608+02:00", comments="Source field: view.id") public static final SqlColumn id = viewRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.683+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.608+02:00", comments="Source field: view.name") public static final SqlColumn name = viewRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.684+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.608+02:00", comments="Source field: view.columns") public static final SqlColumn columns = viewRecord.columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.684+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.608+02:00", comments="Source field: view.position") public static final SqlColumn position = viewRecord.position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.683+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source Table: view") public static final class ViewRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java index b0723034..1371fa46 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ViewRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.685+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.609+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.685+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.609+02:00", comments="Source Table: view") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.685+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.609+02:00", comments="Source Table: view") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.685+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.609+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -55,7 +55,7 @@ public interface ViewRecordMapper { }) ViewRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.685+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.609+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,22 +65,22 @@ public interface ViewRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.685+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.609+02:00", comments="Source Table: view") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.685+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.609+02:00", comments="Source Table: view") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.685+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.609+02:00", comments="Source Table: view") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.685+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.609+02:00", comments="Source Table: view") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord) .where(id, isEqualTo(id_)) @@ -88,7 +88,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.685+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.609+02:00", comments="Source Table: view") default int insert(ViewRecord record) { return insert(SqlBuilder.insert(record) .into(viewRecord) @@ -99,7 +99,7 @@ public interface ViewRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.686+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.610+02:00", comments="Source Table: view") default int insertSelective(ViewRecord record) { return insert(SqlBuilder.insert(record) .into(viewRecord) @@ -110,19 +110,19 @@ public interface ViewRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.686+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.610+02:00", comments="Source Table: view") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, columns, position) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.686+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.610+02:00", comments="Source Table: view") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, columns, position) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.686+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.610+02:00", comments="Source Table: view") default ViewRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, columns, position) .from(viewRecord) @@ -131,7 +131,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.686+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.610+02:00", comments="Source Table: view") default UpdateDSL> updateByExample(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalTo(record::getName) @@ -139,7 +139,7 @@ public interface ViewRecordMapper { .set(position).equalTo(record::getPosition); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.686+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.610+02:00", comments="Source Table: view") default UpdateDSL> updateByExampleSelective(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalToWhenPresent(record::getName) @@ -147,7 +147,7 @@ public interface ViewRecordMapper { .set(position).equalToWhenPresent(record::getPosition); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.686+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.610+02:00", comments="Source Table: view") default int updateByPrimaryKey(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalTo(record::getName) @@ -158,7 +158,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.686+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.611+02:00", comments="Source Table: view") default int updateByPrimaryKeySelective(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java similarity index 62% rename from src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java index d766ad87..eac3df89 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java @@ -5,28 +5,28 @@ import javax.annotation.Generated; import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; -public final class WebserviceServerInfoDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") - public static final WebserviceServerInfo webserviceServerInfo = new WebserviceServerInfo(); +public final class WebserviceServerInfoRecordDynamicSqlSupport { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.696+02:00", comments="Source Table: webservice_server_info") + public static final WebserviceServerInfoRecord webserviceServerInfoRecord = new WebserviceServerInfoRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source field: webservice_server_info.id") - public static final SqlColumn id = webserviceServerInfo.id; + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source field: webservice_server_info.id") + public static final SqlColumn id = webserviceServerInfoRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source field: webservice_server_info.uuid") - public static final SqlColumn uuid = webserviceServerInfo.uuid; + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source field: webservice_server_info.uuid") + public static final SqlColumn uuid = webserviceServerInfoRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source field: webservice_server_info.service_address") - public static final SqlColumn serviceAddress = webserviceServerInfo.serviceAddress; + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source field: webservice_server_info.service_address") + public static final SqlColumn serviceAddress = webserviceServerInfoRecord.serviceAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") - public static final class WebserviceServerInfo extends SqlTable { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.696+02:00", comments="Source Table: webservice_server_info") + public static final class WebserviceServerInfoRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); public final SqlColumn uuid = column("uuid", JDBCType.VARCHAR); public final SqlColumn serviceAddress = column("service_address", JDBCType.VARCHAR); - public WebserviceServerInfo() { + public WebserviceServerInfoRecord() { super("webservice_server_info"); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java similarity index 74% rename from src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java index 12ce4089..bcbfa9dc 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java @@ -1,9 +1,9 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper; -import static ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.WebserviceServerInfoDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.WebserviceServerInfoRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.WebserviceServerInfo; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.WebserviceServerInfoRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -31,119 +31,119 @@ import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider; import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper -public interface WebserviceServerInfoMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") +public interface WebserviceServerInfoRecordMapper { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) - int insert(InsertStatementProvider insertStatement); + int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="uuid", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="service_address", javaType=String.class, jdbcType=JdbcType.VARCHAR) }) - WebserviceServerInfo selectOne(SelectStatementProvider selectStatement); + WebserviceServerInfoRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="uuid", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="service_address", javaType=String.class, jdbcType=JdbcType.VARCHAR) }) - List selectMany(SelectStatementProvider selectStatement); + List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) - .from(webserviceServerInfo); + .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") default DeleteDSL> deleteByExample() { - return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfo); + return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source Table: webservice_server_info") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") default int deleteByPrimaryKey(Long id_) { - return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfo) + return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.839+02:00", comments="Source Table: webservice_server_info") - default int insert(WebserviceServerInfo record) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") + default int insert(WebserviceServerInfoRecord record) { return insert(SqlBuilder.insert(record) - .into(webserviceServerInfo) + .into(webserviceServerInfoRecord) .map(uuid).toProperty("uuid") .map(serviceAddress).toProperty("serviceAddress") .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.839+02:00", comments="Source Table: webservice_server_info") - default int insertSelective(WebserviceServerInfo record) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") + default int insertSelective(WebserviceServerInfoRecord record) { return insert(SqlBuilder.insert(record) - .into(webserviceServerInfo) + .into(webserviceServerInfoRecord) .map(uuid).toPropertyWhenPresent("uuid", record::getUuid) .map(serviceAddress).toPropertyWhenPresent("serviceAddress", record::getServiceAddress) .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.839+02:00", comments="Source Table: webservice_server_info") - default QueryExpressionDSL>> selectByExample() { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.697+02:00", comments="Source Table: webservice_server_info") + default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, uuid, serviceAddress) - .from(webserviceServerInfo); + .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.839+02:00", comments="Source Table: webservice_server_info") - default QueryExpressionDSL>> selectDistinctByExample() { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.698+02:00", comments="Source Table: webservice_server_info") + default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, uuid, serviceAddress) - .from(webserviceServerInfo); + .from(webserviceServerInfoRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.839+02:00", comments="Source Table: webservice_server_info") - default WebserviceServerInfo selectByPrimaryKey(Long id_) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.698+02:00", comments="Source Table: webservice_server_info") + default WebserviceServerInfoRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, uuid, serviceAddress) - .from(webserviceServerInfo) + .from(webserviceServerInfoRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.839+02:00", comments="Source Table: webservice_server_info") - default UpdateDSL> updateByExample(WebserviceServerInfo record) { - return UpdateDSL.updateWithMapper(this::update, webserviceServerInfo) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.698+02:00", comments="Source Table: webservice_server_info") + default UpdateDSL> updateByExample(WebserviceServerInfoRecord record) { + return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalTo(record::getUuid) .set(serviceAddress).equalTo(record::getServiceAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.839+02:00", comments="Source Table: webservice_server_info") - default UpdateDSL> updateByExampleSelective(WebserviceServerInfo record) { - return UpdateDSL.updateWithMapper(this::update, webserviceServerInfo) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.698+02:00", comments="Source Table: webservice_server_info") + default UpdateDSL> updateByExampleSelective(WebserviceServerInfoRecord record) { + return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalToWhenPresent(record::getUuid) .set(serviceAddress).equalToWhenPresent(record::getServiceAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.839+02:00", comments="Source Table: webservice_server_info") - default int updateByPrimaryKey(WebserviceServerInfo record) { - return UpdateDSL.updateWithMapper(this::update, webserviceServerInfo) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.698+02:00", comments="Source Table: webservice_server_info") + default int updateByPrimaryKey(WebserviceServerInfoRecord record) { + return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalTo(record::getUuid) .set(serviceAddress).equalTo(record::getServiceAddress) .where(id, isEqualTo(record::getId)) @@ -151,9 +151,9 @@ public interface WebserviceServerInfoMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.839+02:00", comments="Source Table: webservice_server_info") - default int updateByPrimaryKeySelective(WebserviceServerInfo record) { - return UpdateDSL.updateWithMapper(this::update, webserviceServerInfo) + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.698+02:00", comments="Source Table: webservice_server_info") + default int updateByPrimaryKeySelective(WebserviceServerInfoRecord record) { + return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) .set(uuid).equalToWhenPresent(record::getUuid) .set(serviceAddress).equalToWhenPresent(record::getServiceAddress) .where(id, isEqualTo(record::getId)) @@ -168,6 +168,6 @@ public interface WebserviceServerInfoMapper { default QueryExpressionDSL>> selectIdsByExample() { return SelectDSL.selectDistinctWithMapper(this::selectIds, id) - .from(webserviceServerInfo); + .from(webserviceServerInfoRecord); } } \ No newline at end of file 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/AdditionalAttributeRecord.java similarity index 77% rename from src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java index c093fd44..e0a12d5f 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/AdditionalAttributeRecord.java @@ -2,24 +2,24 @@ 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-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.id") +public class AdditionalAttributeRecord { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.entity_id") private Long entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.833+02:00", comments="Source Table: additional_attributes") - public AdditionalAttributes(Long id, String entityType, Long entityId, String name, String value) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source Table: additional_attributes") + public AdditionalAttributeRecord(Long id, String entityType, Long entityId, String name, String value) { this.id = id; this.entityType = entityType; this.entityId = entityId; @@ -27,27 +27,27 @@ public class AdditionalAttributes { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.entity_id") public Long getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.834+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.693+02:00", comments="Source field: additional_attributes.value") public String getValue() { return value; } @@ -56,7 +56,7 @@ public class AdditionalAttributes { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class AdditionalAttributes { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -90,7 +90,7 @@ public class AdditionalAttributes { if (getClass() != that.getClass()) { return false; } - AdditionalAttributes other = (AdditionalAttributes) that; + AdditionalAttributeRecord other = (AdditionalAttributeRecord) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getEntityType() == null ? other.getEntityType() == null : this.getEntityType().equals(other.getEntityType())) && (this.getEntityId() == null ? other.getEntityId() == null : this.getEntityId().equals(other.getEntityId())) @@ -102,7 +102,7 @@ public class AdditionalAttributes { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 ac14f155..a332bb76 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-07-15T11:57:33.761+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.644+02:00", comments="Source field: client_connection.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.exam_user_session_identifer") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.exam_user_session_identifer") private String examUserSessionIdentifer; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.client_address") private String clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.virtual_client_address") private String virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.761+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.644+02:00", comments="Source Table: client_connection") public ClientConnectionRecord(Long id, Long institutionId, Long examId, String status, String connectionToken, String examUserSessionIdentifer, String clientAddress, String virtualClientAddress) { this.id = id; this.institutionId = institutionId; @@ -39,42 +39,42 @@ public class ClientConnectionRecord { this.virtualClientAddress = virtualClientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.761+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.644+02:00", comments="Source field: client_connection.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.exam_user_session_identifer") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.exam_user_session_identifer") public String getExamUserSessionIdentifer() { return examUserSessionIdentifer; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.client_address") public String getClientAddress() { return clientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.762+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.645+02:00", comments="Source field: client_connection.virtual_client_address") public String getVirtualClientAddress() { return virtualClientAddress; } @@ -83,7 +83,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 802e045d..12303709 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,25 +4,25 @@ import java.math.BigDecimal; import javax.annotation.Generated; public class ClientEventRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.768+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.649+02:00", comments="Source field: client_event.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.650+02:00", comments="Source field: client_event.connection_id") private Long connectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.650+02:00", comments="Source field: client_event.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.numeric_value") private BigDecimal numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.768+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.649+02:00", comments="Source Table: client_event") public ClientEventRecord(Long id, Long connectionId, Integer type, Long timestamp, BigDecimal numericValue, String text) { this.id = id; this.connectionId = connectionId; @@ -32,67 +32,67 @@ public class ClientEventRecord { this.text = text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.768+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.649+02:00", comments="Source Table: client_event") public ClientEventRecord() { super(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.768+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.649+02:00", comments="Source field: client_event.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.768+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.650+02:00", comments="Source field: client_event.id") public void setId(Long id) { this.id = id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.650+02:00", comments="Source field: client_event.connection_id") public Long getConnectionId() { return connectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.650+02:00", comments="Source field: client_event.connection_id") public void setConnectionId(Long connectionId) { this.connectionId = connectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.type") public void setType(Integer type) { this.type = type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.timestamp") public void setTimestamp(Long timestamp) { this.timestamp = timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.numeric_value") public BigDecimal getNumericValue() { return numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.numeric_value") public void setNumericValue(BigDecimal numericValue) { this.numericValue = numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.text") public String getText() { return text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.769+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.651+02:00", comments="Source field: client_event.text") public void setText(String text) { this.text = text == null ? null : text.trim(); } @@ -101,7 +101,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -123,7 +123,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -149,7 +149,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 1a64095a..9f0104b5 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-07-15T11:57:33.466+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.348+02:00", comments="Source field: configuration_attribute.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.467+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.349+02:00", comments="Source field: configuration_attribute.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.467+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.349+02:00", comments="Source field: configuration_attribute.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.468+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.349+02:00", comments="Source field: configuration_attribute.parent_id") private Long parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.468+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.349+02:00", comments="Source field: configuration_attribute.resources") private String resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.469+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.350+02:00", comments="Source field: configuration_attribute.validator") private String validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.470+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.350+02:00", comments="Source field: configuration_attribute.dependencies") private String dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.470+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.350+02:00", comments="Source field: configuration_attribute.default_value") private String defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.455+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.342+02:00", comments="Source Table: configuration_attribute") public ConfigurationAttributeRecord(Long id, String name, String type, Long parentId, String resources, String validator, String dependencies, String defaultValue) { this.id = id; this.name = name; @@ -39,42 +39,42 @@ public class ConfigurationAttributeRecord { this.defaultValue = defaultValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.467+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.349+02:00", comments="Source field: configuration_attribute.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.467+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.349+02:00", comments="Source field: configuration_attribute.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.468+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.349+02:00", comments="Source field: configuration_attribute.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.468+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.349+02:00", comments="Source field: configuration_attribute.parent_id") public Long getParentId() { return parentId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.468+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.350+02:00", comments="Source field: configuration_attribute.resources") public String getResources() { return resources; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.469+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.350+02:00", comments="Source field: configuration_attribute.validator") public String getValidator() { return validator; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.470+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.350+02:00", comments="Source field: configuration_attribute.dependencies") public String getDependencies() { return dependencies; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.471+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.350+02:00", comments="Source field: configuration_attribute.default_value") public String getDefaultValue() { return defaultValue; } @@ -83,7 +83,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 220564d8..2d2a5842 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-07-15T11:57:33.713+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.713+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.713+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.714+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.714+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.714+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.714+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.714+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.713+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source Table: configuration_node") public ConfigurationNodeRecord(Long id, Long institutionId, Long templateId, String owner, String name, String description, String type, String status) { this.id = id; this.institutionId = institutionId; @@ -39,42 +39,42 @@ public class ConfigurationNodeRecord { this.status = status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.713+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.713+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.714+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.714+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.714+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.714+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.714+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.625+02:00", comments="Source field: configuration_node.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.715+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.626+02:00", comments="Source field: configuration_node.status") public String getStatus() { return status; } @@ -83,7 +83,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 c9624bb3..718448f7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java @@ -4,25 +4,25 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class ConfigurationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.699+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.620+02:00", comments="Source field: configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.703+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.621+02:00", comments="Source field: configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.704+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.621+02:00", comments="Source field: configuration.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.705+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.621+02:00", comments="Source field: configuration.version") private String version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.705+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.621+02:00", comments="Source field: configuration.version_date") private DateTime versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.705+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.621+02:00", comments="Source field: configuration.followup") private Integer followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.699+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.620+02:00", comments="Source Table: configuration") public ConfigurationRecord(Long id, Long institutionId, Long configurationNodeId, String version, DateTime versionDate, Integer followup) { this.id = id; this.institutionId = institutionId; @@ -32,32 +32,32 @@ public class ConfigurationRecord { this.followup = followup; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.699+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.620+02:00", comments="Source field: configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.703+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.621+02:00", comments="Source field: configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.705+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.621+02:00", comments="Source field: configuration.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.705+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.621+02:00", comments="Source field: configuration.version") public String getVersion() { return version; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.705+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.621+02:00", comments="Source field: configuration.version_date") public DateTime getVersionDate() { return versionDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.705+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.621+02:00", comments="Source field: configuration.followup") public Integer getFollowup() { return followup; } @@ -66,7 +66,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -88,7 +88,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -114,7 +114,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 2c22e3ed..d33ca91a 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-07-15T11:57:33.673+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.600+02:00", comments="Source field: configuration_value.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.674+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.601+02:00", comments="Source field: configuration_value.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.674+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.601+02:00", comments="Source field: configuration_value.configuration_id") private Long configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.674+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.601+02:00", comments="Source field: configuration_value.configuration_attribute_id") private Long configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.674+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.601+02:00", comments="Source field: configuration_value.list_index") private Integer listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.674+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.602+02:00", comments="Source field: configuration_value.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.673+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.600+02:00", comments="Source Table: configuration_value") public ConfigurationValueRecord(Long id, Long institutionId, Long configurationId, Long configurationAttributeId, Integer listIndex, String value) { this.id = id; this.institutionId = institutionId; @@ -31,32 +31,32 @@ public class ConfigurationValueRecord { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.673+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.600+02:00", comments="Source field: configuration_value.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.674+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.601+02:00", comments="Source field: configuration_value.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.674+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.601+02:00", comments="Source field: configuration_value.configuration_id") public Long getConfigurationId() { return configurationId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.674+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.601+02:00", comments="Source field: configuration_value.configuration_attribute_id") public Long getConfigurationAttributeId() { return configurationAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.674+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.601+02:00", comments="Source field: configuration_value.list_index") public Integer getListIndex() { return listIndex; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.674+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.602+02:00", comments="Source field: configuration_value.value") public String getValue() { return value; } @@ -65,7 +65,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 c9204d71..1040dc8b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamConfigurationMapRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.734+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.631+02:00", comments="Source field: exam_configuration_map.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.740+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.631+02:00", comments="Source field: exam_configuration_map.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.741+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.631+02:00", comments="Source field: exam_configuration_map.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.741+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.631+02:00", comments="Source field: exam_configuration_map.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.741+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.631+02:00", comments="Source field: exam_configuration_map.user_names") private String userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.742+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.632+02:00", comments="Source field: exam_configuration_map.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.732+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.630+02:00", comments="Source Table: exam_configuration_map") public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String userNames, String encryptSecret) { this.id = id; this.institutionId = institutionId; @@ -31,32 +31,32 @@ public class ExamConfigurationMapRecord { this.encryptSecret = encryptSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.734+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.631+02:00", comments="Source field: exam_configuration_map.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.741+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.631+02:00", comments="Source field: exam_configuration_map.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.741+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.631+02:00", comments="Source field: exam_configuration_map.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.741+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.631+02:00", comments="Source field: exam_configuration_map.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.741+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.631+02:00", comments="Source field: exam_configuration_map.user_names") public String getUserNames() { return userNames; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.742+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.632+02:00", comments="Source field: exam_configuration_map.encrypt_secret") public String getEncryptSecret() { return encryptSecret; } @@ -65,7 +65,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 a22e73c0..5006c4c8 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-07-15T11:57:33.753+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.636+02:00", comments="Source field: exam.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.753+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.636+02:00", comments="Source field: exam.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.753+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.636+02:00", comments="Source field: exam.lms_setup_id") private Long lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.753+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.external_id") private String externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.754+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.754+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.755+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.755+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.quit_password") private String quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.755+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.browser_keys") private String browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.755+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.753+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.636+02:00", comments="Source Table: exam") public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String quitPassword, String browserKeys, 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-07-15T11:57:33.753+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.636+02:00", comments="Source field: exam.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.753+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.636+02:00", comments="Source field: exam.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.753+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.lms_setup_id") public Long getLmsSetupId() { return lmsSetupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.753+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.external_id") public String getExternalId() { return externalId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.754+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.754+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.755+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.755+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.quit_password") public String getQuitPassword() { return quitPassword; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.755+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.639+02:00", comments="Source field: exam.browser_keys") public String getBrowserKeys() { return browserKeys; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.755+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.640+02:00", comments="Source field: exam.active") public Integer getActive() { return active; } @@ -101,7 +101,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 5f5431ae..899dc687 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-07-15T11:57:33.775+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.654+02:00", comments="Source field: indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.775+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.654+02:00", comments="Source field: indicator.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.775+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.655+02:00", comments="Source field: indicator.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.775+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.655+02:00", comments="Source field: indicator.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.655+02:00", comments="Source field: indicator.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.775+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.654+02:00", comments="Source Table: indicator") public IndicatorRecord(Long id, Long examId, String type, String name, String color) { this.id = id; this.examId = examId; @@ -27,27 +27,27 @@ public class IndicatorRecord { this.color = color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.775+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.654+02:00", comments="Source field: indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.775+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.654+02:00", comments="Source field: indicator.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.775+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.655+02:00", comments="Source field: indicator.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.775+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.655+02:00", comments="Source field: indicator.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.776+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.655+02:00", comments="Source field: indicator.color") public String getColor() { return color; } @@ -56,7 +56,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 9ef3f0b7..0e256523 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-07-15T11:57:33.783+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.665+02:00", comments="Source field: institution.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.783+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.666+02:00", comments="Source field: institution.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.783+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.666+02:00", comments="Source field: institution.url_suffix") private String urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.783+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.666+02:00", comments="Source field: institution.theme_name") private String themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.783+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.669+02:00", comments="Source field: institution.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.784+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.669+02:00", comments="Source field: institution.logo_image") private String logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.783+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.665+02:00", comments="Source Table: institution") public InstitutionRecord(Long id, String name, String urlSuffix, String themeName, Integer active, String logoImage) { this.id = id; this.name = name; @@ -31,32 +31,32 @@ public class InstitutionRecord { this.logoImage = logoImage; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.783+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.666+02:00", comments="Source field: institution.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.783+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.666+02:00", comments="Source field: institution.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.783+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.666+02:00", comments="Source field: institution.url_suffix") public String getUrlSuffix() { return urlSuffix; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.783+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.667+02:00", comments="Source field: institution.theme_name") public String getThemeName() { return themeName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.783+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.669+02:00", comments="Source field: institution.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.784+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.669+02:00", comments="Source field: institution.logo_image") public String getLogoImage() { return logoImage; } @@ -65,7 +65,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 1e507125..04afd3d3 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-07-15T11:57:33.793+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.lms_type") private String lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.lms_url") private String lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.lms_clientname") private String lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.lms_clientsecret") private String lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.678+02:00", comments="Source field: lms_setup.lms_rest_api_token") private String lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.678+02:00", comments="Source field: lms_setup.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.793+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source Table: lms_setup") public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, 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-07-15T11:57:33.793+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.lms_type") public String getLmsType() { return lmsType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.lms_url") public String getLmsUrl() { return lmsUrl; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.677+02:00", comments="Source field: lms_setup.lms_clientname") public String getLmsClientname() { return lmsClientname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.678+02:00", comments="Source field: lms_setup.lms_clientsecret") public String getLmsClientsecret() { return lmsClientsecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.678+02:00", comments="Source field: lms_setup.lms_rest_api_token") public String getLmsRestApiToken() { return lmsRestApiToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.794+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.678+02: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 Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 b336993d..09bc7ccd 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java @@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class OrientationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.688+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.611+02:00", comments="Source field: orientation.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.688+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.611+02:00", comments="Source field: orientation.config_attribute_id") private Long configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.view_id") private Long viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.group_id") private String groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.x_position") private Integer xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.y_position") private Integer yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.690+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.width") private Integer width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.690+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.613+02:00", comments="Source field: orientation.height") private Integer height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.690+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.613+02:00", comments="Source field: orientation.title") private String title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.688+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.611+02:00", comments="Source Table: orientation") public OrientationRecord(Long id, Long configAttributeId, Long templateId, Long viewId, String groupId, Integer xPosition, Integer yPosition, Integer width, Integer height, String title) { this.id = id; this.configAttributeId = configAttributeId; @@ -47,52 +47,52 @@ public class OrientationRecord { this.title = title; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.688+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.611+02:00", comments="Source field: orientation.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.config_attribute_id") public Long getConfigAttributeId() { return configAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.view_id") public Long getViewId() { return viewId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.group_id") public String getGroupId() { return groupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.x_position") public Integer getxPosition() { return xPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.689+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.612+02:00", comments="Source field: orientation.y_position") public Integer getyPosition() { return yPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.690+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.613+02:00", comments="Source field: orientation.width") public Integer getWidth() { return width; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.690+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.613+02:00", comments="Source field: orientation.height") public Integer getHeight() { return height; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.690+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.613+02:00", comments="Source field: orientation.title") public String getTitle() { return title; } @@ -101,7 +101,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 c84823e0..8fd7720a 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-07-15T11:57:33.811+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.688+02:00", comments="Source field: user_role.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.811+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.688+02:00", comments="Source field: user_role.user_id") private Long userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.811+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.688+02:00", comments="Source field: user_role.role_name") private String roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.811+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.687+02:00", comments="Source Table: user_role") public RoleRecord(Long id, Long userId, String roleName) { this.id = id; this.userId = userId; this.roleName = roleName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.811+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.688+02:00", comments="Source field: user_role.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.811+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.688+02:00", comments="Source field: user_role.user_id") public Long getUserId() { return userId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.811+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.688+02:00", comments="Source field: user_role.role_name") public String getRoleName() { return roleName; } @@ -38,7 +38,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -57,7 +57,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -80,7 +80,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java index f234bbe9..dde3aad8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java @@ -4,31 +4,31 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class SebClientConfigRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.673+02:00", comments="Source field: seb_client_configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.673+02:00", comments="Source field: seb_client_configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.date") private DateTime date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.client_name") private String clientName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.client_secret") private String clientSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.673+02:00", comments="Source Table: seb_client_configuration") public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, String encryptSecret, Integer active) { this.id = id; this.institutionId = institutionId; @@ -40,42 +40,42 @@ public class SebClientConfigRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.673+02:00", comments="Source field: seb_client_configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.date") public DateTime getDate() { return date; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.client_name") public String getClientName() { return clientName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.client_secret") public String getClientSecret() { return clientSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.encrypt_secret") public String getEncryptSecret() { return encryptSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.789+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.674+02:00", comments="Source field: seb_client_configuration.active") public Integer getActive() { return active; } @@ -84,7 +84,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -108,7 +108,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -136,7 +136,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 c69f1e33..49e8198f 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-07-15T11:57:33.779+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.659+02:00", comments="Source field: threshold.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.659+02:00", comments="Source field: threshold.indicator_id") private Long indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.659+02:00", comments="Source field: threshold.value") private BigDecimal value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.659+02:00", comments="Source field: threshold.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.779+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.659+02:00", comments="Source Table: threshold") public ThresholdRecord(Long id, Long indicatorId, BigDecimal value, String color) { this.id = id; this.indicatorId = indicatorId; @@ -24,22 +24,22 @@ public class ThresholdRecord { this.color = color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.659+02:00", comments="Source field: threshold.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.659+02:00", comments="Source field: threshold.indicator_id") public Long getIndicatorId() { return indicatorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.659+02:00", comments="Source field: threshold.value") public BigDecimal getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.780+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.659+02:00", comments="Source field: threshold.color") public String getColor() { return color; } @@ -48,7 +48,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -68,7 +68,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -92,7 +92,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 00720e12..7ed6c2f7 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-07-15T11:57:33.816+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source field: user_activity_log.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.816+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source field: user_activity_log.user_uuid") private String userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.816+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source field: user_activity_log.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.816+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source field: user_activity_log.activity_type") private String activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.817+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.817+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.entity_id") private String entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.817+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.message") private String message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.815+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source Table: user_activity_log") public UserActivityLogRecord(Long id, String userUuid, Long timestamp, String activityType, String entityType, String entityId, String message) { this.id = id; this.userUuid = userUuid; @@ -35,37 +35,37 @@ public class UserActivityLogRecord { this.message = message; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.816+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source field: user_activity_log.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.816+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source field: user_activity_log.user_uuid") public String getUserUuid() { return userUuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.816+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source field: user_activity_log.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.817+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.690+02:00", comments="Source field: user_activity_log.activity_type") public String getActivityType() { return activityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.817+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.817+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.entity_id") public String getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.817+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.691+02:00", comments="Source field: user_activity_log.message") public String getMessage() { return message; } @@ -74,7 +74,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -97,7 +97,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -124,7 +124,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 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 4439bc9c..ed353463 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-07-15T11:57:33.803+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source field: user.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.803+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source field: user.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source field: user.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source field: user.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source field: user.username") private String username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.password") private String password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.email") private String email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.language") private String language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.806+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.timezone") private String timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.806+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.803+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02: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-07-15T11:57:33.803+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source field: user.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.803+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source field: user.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source field: user.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source field: user.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.681+02:00", comments="Source field: user.username") public String getUsername() { return username; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.password") public String getPassword() { return password; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.email") public String getEmail() { return email; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.805+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.language") public String getLanguage() { return language; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.806+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.timezone") public String getTimezone() { return timezone; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.806+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.682+02:00", comments="Source field: user.active") public Integer getActive() { return active; } @@ -101,7 +101,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java index ed07b846..297127ba 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java @@ -3,19 +3,19 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ViewRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.681+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source field: view.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.681+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source field: view.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.681+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source field: view.columns") private Integer columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.681+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source field: view.position") private Integer position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.681+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source Table: view") public ViewRecord(Long id, String name, Integer columns, Integer position) { this.id = id; this.name = name; @@ -23,22 +23,22 @@ public class ViewRecord { this.position = position; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.681+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source field: view.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.681+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source field: view.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.681+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source field: view.columns") public Integer getColumns() { return columns; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.681+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.607+02:00", comments="Source field: view.position") public Integer getPosition() { return position; } @@ -47,7 +47,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -67,7 +67,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -91,7 +91,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfo.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java similarity index 77% rename from src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfo.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java index b5c2f250..eed959c3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfo.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java @@ -2,34 +2,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; -public class WebserviceServerInfo { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.837+02:00", comments="Source field: webservice_server_info.id") +public class WebserviceServerInfoRecord { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.696+02:00", comments="Source field: webservice_server_info.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.837+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.696+02:00", comments="Source field: webservice_server_info.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.696+02:00", comments="Source field: webservice_server_info.service_address") private String serviceAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.837+02:00", comments="Source Table: webservice_server_info") - public WebserviceServerInfo(Long id, String uuid, String serviceAddress) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.696+02:00", comments="Source Table: webservice_server_info") + public WebserviceServerInfoRecord(Long id, String uuid, String serviceAddress) { this.id = id; this.uuid = uuid; this.serviceAddress = serviceAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.837+02:00", comments="Source field: webservice_server_info.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.696+02:00", comments="Source field: webservice_server_info.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.837+02:00", comments="Source field: webservice_server_info.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.696+02:00", comments="Source field: webservice_server_info.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-15T11:57:33.838+02:00", comments="Source field: webservice_server_info.service_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-07-18T10:59:08.696+02:00", comments="Source field: webservice_server_info.service_address") public String getServiceAddress() { return serviceAddress; } @@ -38,7 +38,7 @@ public class WebserviceServerInfo { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public String toString() { @@ -57,7 +57,7 @@ public class WebserviceServerInfo { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public boolean equals(Object that) { @@ -70,7 +70,7 @@ public class WebserviceServerInfo { if (getClass() != that.getClass()) { return false; } - WebserviceServerInfo other = (WebserviceServerInfo) that; + WebserviceServerInfoRecord other = (WebserviceServerInfoRecord) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getUuid() == null ? other.getUuid() == null : this.getUuid().equals(other.getUuid())) && (this.getServiceAddress() == null ? other.getServiceAddress() == null : this.getServiceAddress().equals(other.getServiceAddress())); @@ -80,7 +80,7 @@ public class WebserviceServerInfo { * This method was generated by MyBatis Generator. * This method corresponds to the database table webservice_server_info * - * @mbg.generated Mon Jul 15 11:57:33 CEST 2019 + * @mbg.generated Thu Jul 18 10:59:08 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/AdditionalAttributesDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/AdditionalAttributesDAO.java new file mode 100644 index 00000000..9aa4e831 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/AdditionalAttributesDAO.java @@ -0,0 +1,35 @@ +/* + * 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 java.util.Collection; + +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.AdditionalAttributeRecord; + +public interface AdditionalAttributesDAO { + + Result> getAdditionalAttributes( + EntityType type, + Long entityId); + + void saveAdditionalAttribute( + EntityType type, + Long entityId, + String name, + String value); + + void delete(Long id); + + void delete(Long entityId, String name); + + void deleteAll(Long entityId); + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/AdditionalAttributesDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/AdditionalAttributesDAOImpl.java new file mode 100644 index 00000000..31b7a3fa --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/AdditionalAttributesDAOImpl.java @@ -0,0 +1,146 @@ +/* + * 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 java.util.Collection; +import java.util.Optional; + +import org.mybatis.dynamic.sql.SqlBuilder; +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.profile.WebServiceProfile; +import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.AdditionalAttributeRecordDynamicSqlSupport; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.AdditionalAttributeRecordMapper; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.AdditionalAttributeRecord; +import ch.ethz.seb.sebserver.webservice.servicelayer.dao.AdditionalAttributesDAO; + +@Lazy +@Component +@WebServiceProfile +public class AdditionalAttributesDAOImpl implements AdditionalAttributesDAO { + + private final AdditionalAttributeRecordMapper additionalAttributeRecordMapperer; + + protected AdditionalAttributesDAOImpl(final AdditionalAttributeRecordMapper additionalAttributeRecordMapperer) { + this.additionalAttributeRecordMapperer = additionalAttributeRecordMapperer; + } + + @Override + @Transactional(readOnly = true) + public Result> getAdditionalAttributes( + final EntityType type, + final Long entityId) { + + return Result.tryCatch(() -> { + + return this.additionalAttributeRecordMapperer + .selectByExample() + .where( + AdditionalAttributeRecordDynamicSqlSupport.entityType, + SqlBuilder.isEqualTo(type.name())) + .and( + AdditionalAttributeRecordDynamicSqlSupport.entityId, + SqlBuilder.isEqualTo(entityId)) + .build() + .execute(); + + }); + } + + @Override + @Transactional + public void saveAdditionalAttribute( + final EntityType type, + final Long entityId, + final String name, + final String value) { + + if (value == null) { + this.delete(entityId, name); + return; + } + + final Optional id = this.additionalAttributeRecordMapperer + .selectIdsByExample() + .where( + AdditionalAttributeRecordDynamicSqlSupport.entityType, + SqlBuilder.isEqualTo(type.name())) + .and( + AdditionalAttributeRecordDynamicSqlSupport.entityId, + SqlBuilder.isEqualTo(entityId)) + .and( + AdditionalAttributeRecordDynamicSqlSupport.name, + SqlBuilder.isEqualTo(name)) + .build() + .execute() + .stream() + .findFirst(); + + if (id.isPresent()) { + final AdditionalAttributeRecord rec = new AdditionalAttributeRecord( + id.get(), + type.name(), + entityId, + name, + value); + this.additionalAttributeRecordMapperer + .updateByPrimaryKeySelective(rec); + } else { + final AdditionalAttributeRecord rec = new AdditionalAttributeRecord( + null, + type.name(), + entityId, + name, + value); + this.additionalAttributeRecordMapperer + .insert(rec); + } + + } + + @Override + @Transactional + public void delete(final Long id) { + this.additionalAttributeRecordMapperer + .deleteByPrimaryKey(id); + } + + @Override + @Transactional + public void delete(final Long entityId, final String name) { + this.additionalAttributeRecordMapperer + .deleteByExample() + .where( + AdditionalAttributeRecordDynamicSqlSupport.entityId, + SqlBuilder.isEqualTo(entityId)) + .and( + AdditionalAttributeRecordDynamicSqlSupport.name, + SqlBuilder.isEqualTo(name)) + .build() + .execute(); + + } + + @Override + @Transactional + public void deleteAll(final Long entityId) { + this.additionalAttributeRecordMapperer + .deleteByExample() + .where( + AdditionalAttributeRecordDynamicSqlSupport.entityId, + SqlBuilder.isEqualTo(entityId)) + .build() + .execute(); + } + +} 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 index a9ad70c4..3d313aa4 100644 --- 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 @@ -38,6 +38,7 @@ import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.SebClientConfigRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.SebClientConfigRecordMapper; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.AdditionalAttributeRecord; 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; @@ -55,13 +56,16 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO { private final SebClientConfigRecordMapper sebClientConfigRecordMapper; private final ClientCredentialService clientCredentialService; + private final AdditionalAttributesDAOImpl additionalAttributesDAO; protected SebClientConfigDAOImpl( final SebClientConfigRecordMapper sebClientConfigRecordMapper, - final ClientCredentialService clientCredentialService) { + final ClientCredentialService clientCredentialService, + final AdditionalAttributesDAOImpl additionalAttributesDAO) { this.sebClientConfigRecordMapper = sebClientConfigRecordMapper; this.clientCredentialService = clientCredentialService; + this.additionalAttributesDAO = additionalAttributesDAO; } @Override @@ -73,7 +77,7 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO { @Transactional(readOnly = true) public Result byPK(final Long id) { return recordById(id) - .flatMap(SebClientConfigDAOImpl::toDomainModel); + .flatMap(this::toDomainModel); } @Override @@ -94,7 +98,7 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO { : this.sebClientConfigRecordMapper.selectByExample().build().execute(); return records.stream() - .map(SebClientConfigDAOImpl::toDomainModel) + .map(this::toDomainModel) .flatMap(DAOLoggingSupport::logAndSkipOnError) .collect(Collectors.toList()); }); @@ -125,7 +129,7 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO { .build() .execute() .stream() - .map(SebClientConfigDAOImpl::toDomainModel) + .map(this::toDomainModel) .flatMap(DAOLoggingSupport::logAndSkipOnError) .filter(predicate) .collect(Collectors.toList()); @@ -144,7 +148,7 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO { .build() .execute() .stream() - .map(SebClientConfigDAOImpl::toDomainModel) + .map(this::toDomainModel) .flatMap(DAOLoggingSupport::logAndSkipOnError) .collect(Utils.toSingleton()); }); @@ -227,10 +231,18 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO { getEncryptionPassword(sebClientConfig), BooleanUtils.toInteger(BooleanUtils.isTrue(sebClientConfig.active))); - this.sebClientConfigRecordMapper.insert(newRecord); + this.sebClientConfigRecordMapper + .insert(newRecord); + + this.additionalAttributesDAO.saveAdditionalAttribute( + EntityType.SEB_CLIENT_CONFIGURATION, + newRecord.getId(), + SebClientConfig.ATTR_FALLBACK_START_URL, + sebClientConfig.fallbackStartURL); + return newRecord; }) - .flatMap(SebClientConfigDAOImpl::toDomainModel) + .flatMap(this::toDomainModel) .onError(TransactionHandler::rollback); } @@ -251,10 +263,19 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO { getEncryptionPassword(sebClientConfig), null); - this.sebClientConfigRecordMapper.updateByPrimaryKeySelective(newRecord); - return this.sebClientConfigRecordMapper.selectByPrimaryKey(sebClientConfig.id); + this.sebClientConfigRecordMapper + .updateByPrimaryKeySelective(newRecord); + + this.additionalAttributesDAO.saveAdditionalAttribute( + EntityType.SEB_CLIENT_CONFIGURATION, + newRecord.getId(), + SebClientConfig.ATTR_FALLBACK_START_URL, + sebClientConfig.fallbackStartURL); + + return this.sebClientConfigRecordMapper + .selectByPrimaryKey(sebClientConfig.id); }) - .flatMap(SebClientConfigDAOImpl::toDomainModel) + .flatMap(this::toDomainModel) .onError(TransactionHandler::rollback); } @@ -286,7 +307,7 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO { .build() .execute() .stream() - .map(SebClientConfigDAOImpl::toDomainModel) + .map(this::toDomainModel) .flatMap(DAOLoggingSupport::logAndSkipOnError) .collect(Collectors.toList()); }); @@ -341,7 +362,9 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO { private Result recordById(final Long id) { return Result.tryCatch(() -> { - final SebClientConfigRecord record = this.sebClientConfigRecordMapper.selectByPrimaryKey(id); + final SebClientConfigRecord record = this.sebClientConfigRecordMapper + .selectByPrimaryKey(id); + if (record == null) { throw new ResourceNotFoundException( EntityType.SEB_CLIENT_CONFIGURATION, @@ -351,11 +374,22 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO { }); } - private static Result toDomainModel(final SebClientConfigRecord record) { + private Result toDomainModel(final SebClientConfigRecord record) { + final String fallbackURL = this.additionalAttributesDAO.getAdditionalAttributes( + EntityType.SEB_CLIENT_CONFIGURATION, + record.getId()) + .getOrThrow() + .stream() + .filter(rec -> SebClientConfig.ATTR_FALLBACK_START_URL.equals(rec.getName())) + .findFirst() + .map(AdditionalAttributeRecord::getValue) + .orElse(null); + return Result.tryCatch(() -> new SebClientConfig( record.getId(), record.getInstitutionId(), record.getName(), + fallbackURL, record.getDate(), null, null, diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/SebClientConfigService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/SebClientConfigService.java index 77034552..039a711c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/SebClientConfigService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/SebClientConfigService.java @@ -32,9 +32,10 @@ public interface SebClientConfigService { " sebMode\r\n" + " 1\r\n" + " sebConfigPurpose\r\n" + - " 1" + + " 1\r\n" + " sebServerFallback\r\n" + - " \r\n" + + " <%s />\r\n" + + " %s" + " sebServerURL\r\n" + " %s\r\n" + " sebServerConfiguration\r\n" + @@ -50,14 +51,6 @@ public interface SebClientConfigService { " \r\n" + " \r\n"; - /** Get the server URL prefix in form of; - * [scheme{http|https}]://[server-address{DNS-name|IP}]:[port] - * - * E.g.: https://seb.server.ch:8080 - * - * @return the server URL prefix */ - String getServerURL(); - /** Indicates if there is any SebClientConfiguration for a specified institution. * * @param institutionId the institution identifier diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/SebClientConfigServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/SebClientConfigServiceImpl.java index 8ef4a195..b63ab60c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/SebClientConfigServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/SebClientConfigServiceImpl.java @@ -24,14 +24,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Lazy; -import org.springframework.core.env.Environment; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.provider.ClientDetails; import org.springframework.security.oauth2.provider.client.BaseClientDetails; import org.springframework.security.oauth2.provider.token.TokenStore; import org.springframework.stereotype.Service; -import org.springframework.web.util.UriComponentsBuilder; import ch.ethz.seb.sebserver.WebSecurityConfig; import ch.ethz.seb.sebserver.gbl.Constants; @@ -43,6 +41,7 @@ import ch.ethz.seb.sebserver.gbl.model.sebconfig.SebClientConfig; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Utils; +import ch.ethz.seb.sebserver.webservice.WebserviceInfo; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkAction; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionEvent; import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentialService; @@ -61,13 +60,6 @@ import ch.ethz.seb.sebserver.webservice.weblayer.oauth.WebserviceResourceConfigu @WebServiceProfile public class SebClientConfigServiceImpl implements SebClientConfigService { - private static final String WEB_SERVICE_SERVER_NAME_KEY = "sebserver.webservice.http.server.name"; - private static final String WEB_SERVICE_HTTP_SCHEME_KEY = "sebserver.webservice.http.scheme"; - private static final String WEB_SERVICE_SERVER_ADDRESS_KEY = "server.address"; - private static final String WEB_SERVICE_SERVER_PORT_KEY = "server.port"; - private static final String WEB_SERVICE_EXAM_API_DISCOVERY_ENDPOINT_KEY = - "sebserver.webservice.api.exam.endpoint.discovery"; - private static final Logger log = LoggerFactory.getLogger(SebClientConfigServiceImpl.class); private final InstitutionDAO institutionDAO; @@ -77,13 +69,7 @@ public class SebClientConfigServiceImpl implements SebClientConfigService { private final PasswordEncoder clientPasswordEncoder; private final ZipService zipService; private final TokenStore tokenStore; - private final String httpScheme; - private final String serverAddress; - private final String serverName; - private final String serverPort; - private final String discoveryEndpoint; - - private final String serverURLPrefix; + private final WebserviceInfo webserviceInfo; protected SebClientConfigServiceImpl( final InstitutionDAO institutionDAO, @@ -93,7 +79,7 @@ public class SebClientConfigServiceImpl implements SebClientConfigService { final ZipService zipService, final TokenStore tokenStore, @Qualifier(WebSecurityConfig.CLIENT_PASSWORD_ENCODER_BEAN_NAME) final PasswordEncoder clientPasswordEncoder, - final Environment environment) { + final WebserviceInfo webserviceInfo) { this.institutionDAO = institutionDAO; this.sebClientConfigDAO = sebClientConfigDAO; @@ -102,20 +88,7 @@ public class SebClientConfigServiceImpl implements SebClientConfigService { this.zipService = zipService; this.clientPasswordEncoder = clientPasswordEncoder; this.tokenStore = tokenStore; - - this.httpScheme = environment.getRequiredProperty(WEB_SERVICE_HTTP_SCHEME_KEY); - this.serverAddress = environment.getRequiredProperty(WEB_SERVICE_SERVER_ADDRESS_KEY); - this.serverName = environment.getProperty(WEB_SERVICE_SERVER_NAME_KEY, ""); - this.serverPort = environment.getRequiredProperty(WEB_SERVICE_SERVER_PORT_KEY); - this.discoveryEndpoint = environment.getRequiredProperty(WEB_SERVICE_EXAM_API_DISCOVERY_ENDPOINT_KEY); - - this.serverURLPrefix = UriComponentsBuilder.newInstance() - .scheme(this.httpScheme) - .host((StringUtils.isNotBlank(this.serverName)) - ? this.serverName - : this.serverAddress) - .port(this.serverPort) - .toUriString(); + this.webserviceInfo = webserviceInfo; } @Override @@ -138,6 +111,7 @@ public class SebClientConfigServiceImpl implements SebClientConfigService { null, null, null, + null, true); }) .flatMap(this.sebClientConfigDAO::createNew); @@ -175,25 +149,11 @@ public class SebClientConfigServiceImpl implements SebClientConfigService { final SebClientConfig config = this.sebClientConfigDAO .byModelId(modelId).getOrThrow(); - final ClientCredentials sebClientCredentials = this.sebClientConfigDAO - .getSebClientCredentials(config.getModelId()) - .getOrThrow(); - final CharSequence encryptionPassword = this.sebClientConfigDAO .getConfigPasswortCipher(config.getModelId()) .getOrThrow(); - final CharSequence plainClientId = sebClientCredentials.clientId; - final CharSequence plainClientSecret = this.clientCredentialService - .getPlainClientSecret(sebClientCredentials); - - final String plainTextConfig = String.format( - SEB_CLIENT_CONFIG_EXAMPLE_XML, - getServerURL(), - String.valueOf(config.institutionId), - plainClientId, - plainClientSecret, - this.getServerURL() + this.discoveryEndpoint); + final String plainTextConfig = getPlainXMLConfig(config); PipedOutputStream pOut = null; PipedInputStream pIn = null; @@ -240,9 +200,48 @@ public class SebClientConfigServiceImpl implements SebClientConfigService { } } - @Override - public String getServerURL() { - return this.serverURLPrefix; + public String getPlainXMLConfig(final SebClientConfig config) { + + final ClientCredentials sebClientCredentials = this.sebClientConfigDAO + .getSebClientCredentials(config.getModelId()) + .getOrThrow(); + + final CharSequence plainClientId = sebClientCredentials.clientId; + final CharSequence plainClientSecret = this.clientCredentialService + .getPlainClientSecret(sebClientCredentials); + + final String plainTextConfig = extractXML( + config, + plainClientId, + plainClientSecret); + + return plainTextConfig; + } + + private String extractXML(final SebClientConfig config, + final CharSequence plainClientId, + final CharSequence plainClientSecret) { + + final String plainTextConfig = String.format( + SEB_CLIENT_CONFIG_EXAMPLE_XML, + (StringUtils.isNotBlank(config.fallbackStartURL)) + ? "true" + : "false", + (StringUtils.isNotBlank(config.fallbackStartURL)) + ? " startURL\r\n" + + " " + config.fallbackStartURL + "\r\n" + : "", + this.webserviceInfo.getServerURL(), + String.valueOf(config.institutionId), + plainClientId, + plainClientSecret, + this.webserviceInfo.getDiscoveryEndpointAddress()); + + if (log.isDebugEnabled()) { + log.debug("SEB client configuration export:\n {}", plainTextConfig); + } + + return plainTextConfig; } @Override diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/PingHandlingStrategy.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/PingHandlingStrategy.java index 50a83b8f..ac3553e7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/PingHandlingStrategy.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/PingHandlingStrategy.java @@ -10,6 +10,8 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session; public interface PingHandlingStrategy { + void initForConnection(Long connectionId, String connectionToken); + void notifyPing(final String connectionToken, final long timestamp, final int pingNumber); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/AsyncBatchEventSaveStrategy.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/AsyncBatchEventSaveStrategy.java index 7a34f00e..dc228578 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/AsyncBatchEventSaveStrategy.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/AsyncBatchEventSaveStrategy.java @@ -137,14 +137,9 @@ public class AsyncBatchEventSaveStrategy implements EventHandlingStrategy { sleepTime = 100; this.transactionTemplate .execute(status -> { - events.stream() - .forEach(rec -> { - if (rec.getId() == null) { - clientEventMapper.insert(rec); - } else { - clientEventMapper.updateByPrimaryKeySelective(rec); - } - }); + events + .stream() + .forEach(clientEventMapper::insert); return null; }); } else { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/DistributedServerPingHandler.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/DistributedServerPingHandler.java index c23550f2..d374239e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/DistributedServerPingHandler.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/DistributedServerPingHandler.java @@ -10,19 +10,17 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl; import java.math.BigDecimal; -import org.mybatis.dynamic.sql.SqlBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent.EventType; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Utils; -import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientEventRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientEventRecordMapper; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ClientEventRecord; -import ch.ethz.seb.sebserver.webservice.servicelayer.session.EventHandlingStrategy; import ch.ethz.seb.sebserver.webservice.servicelayer.session.PingHandlingStrategy; @Lazy @@ -33,30 +31,26 @@ public class DistributedServerPingHandler implements PingHandlingStrategy { private static final Logger log = LoggerFactory.getLogger(DistributedServerPingHandler.class); private final ExamSessionCacheService examSessionCacheService; - private final EventHandlingStrategy eventHandlingStrategy; private final ClientEventRecordMapper clientEventRecordMapper; protected DistributedServerPingHandler( final ExamSessionCacheService examSessionCacheService, - final EventHandlingStrategyFactory eventHandlingStrategyFactory, final ClientEventRecordMapper clientEventRecordMapper) { this.examSessionCacheService = examSessionCacheService; - this.eventHandlingStrategy = eventHandlingStrategyFactory.get(); this.clientEventRecordMapper = clientEventRecordMapper; } @Override + @Transactional public void notifyPing(final String connectionToken, final long timestamp, final int pingNumber) { + // store last ping in event final ClientEventRecord pingRecord = this.examSessionCacheService.getPingRecord(connectionToken); - final boolean update = pingRecord.getId() == null && pingRecord.getTimestamp() != null; - pingRecord.setTimestamp(timestamp); - pingRecord.setNumericValue(new BigDecimal(pingNumber)); - if (update) { - updatePingEventId(pingRecord); - } else { - this.eventHandlingStrategy.accept(pingRecord); + if (pingRecord != null) { + pingRecord.setTimestamp(timestamp); + pingRecord.setNumericValue(new BigDecimal(pingNumber)); + this.clientEventRecordMapper.updateByPrimaryKeySelective(pingRecord); } // update ping indicators @@ -68,28 +62,15 @@ public class DistributedServerPingHandler implements PingHandlingStrategy { .stream() .forEach(pingIndicator -> pingIndicator.notifyPing(timestamp, pingNumber)); } - } - private void updatePingEventId(final ClientEventRecord pingRecord) { - try { - final Long id = this.clientEventRecordMapper.selectIdsByExample() - .where( - ClientEventRecordDynamicSqlSupport.connectionId, - SqlBuilder.isEqualTo(pingRecord.getConnectionId())) - .and( - ClientEventRecordDynamicSqlSupport.type, - SqlBuilder.isEqualTo(EventType.LAST_PING.id)) - .build() - .execute() - .stream() - .collect(Utils.toSingleton()); - if (id != null) { - pingRecord.setId(id); - } - } catch (final Exception e) { - log.error("Failed to verify record identifier for re-usable ClientEvent for ping"); - } + @Override + public void initForConnection(final Long connectionId, final String connectionToken) { + final ClientEventRecord clientEventRecord = new ClientEventRecord(); + clientEventRecord.setConnectionId(connectionId); + clientEventRecord.setType(EventType.LAST_PING.id); + clientEventRecord.setTimestamp(Utils.getMillisecondsNow()); + this.clientEventRecordMapper.insertSelective(clientEventRecord); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionCacheService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionCacheService.java index 424a226b..966819a0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionCacheService.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionCacheService.java @@ -10,18 +10,24 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl; import java.io.ByteArrayOutputStream; +import org.mybatis.dynamic.sql.SqlBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; +import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection; import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent.EventType; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.util.Result; +import ch.ethz.seb.sebserver.gbl.util.Utils; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientEventRecordDynamicSqlSupport; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientEventRecordMapper; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ClientEventRecord; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientConnectionDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO; @@ -49,17 +55,20 @@ public class ExamSessionCacheService { private final ClientConnectionDAO clientConnectionDAO; private final ClientIndicatorFactory clientIndicatorFactory; private final SebExamConfigService sebExamConfigService; + private final ClientEventRecordMapper clientEventRecordMapper; protected ExamSessionCacheService( final ExamDAO examDAO, final ClientConnectionDAO clientConnectionDAO, final ClientIndicatorFactory clientIndicatorFactory, - final SebExamConfigService sebExamConfigService) { + final SebExamConfigService sebExamConfigService, + final ClientEventRecordMapper clientEventRecordMapper) { this.examDAO = examDAO; this.clientConnectionDAO = clientConnectionDAO; this.clientIndicatorFactory = clientIndicatorFactory; this.sebExamConfigService = sebExamConfigService; + this.clientEventRecordMapper = clientEventRecordMapper; } @Cacheable( @@ -83,6 +92,9 @@ public class ExamSessionCacheService { return null; } + // TODO: this is ev. a good point to trigger the LMS course restriction + // for the exam with Config Key + return exam; } @@ -103,8 +115,8 @@ public class ExamSessionCacheService { if (exam == null) { return false; } - return ((exam.startTime.isEqualNow() || exam.startTime.isBeforeNow()) && - exam.endTime.isAfterNow()); + + return exam.getStatus() == ExamStatus.RUNNING; } @Cacheable( @@ -172,6 +184,7 @@ public class ExamSessionCacheService { cacheNames = CACHE_NAME_PING_RECORD, key = "#connectionToken", unless = "#result == null") + @Transactional public ClientEventRecord getPingRecord(final String connectionToken) { if (log.isDebugEnabled()) { log.debug("Verify ClientConnection for ping record to cache by connectionToken: ", connectionToken); @@ -181,10 +194,23 @@ public class ExamSessionCacheService { if (clientConnection == null) { return null; } else { - final ClientEventRecord clientEventRecord = new ClientEventRecord(); - clientEventRecord.setConnectionId(clientConnection.id); - clientEventRecord.setType(EventType.LAST_PING.id); - return clientEventRecord; + try { + return this.clientEventRecordMapper.selectByExample() + .where( + ClientEventRecordDynamicSqlSupport.connectionId, + SqlBuilder.isEqualTo(clientConnection.getId())) + .and( + ClientEventRecordDynamicSqlSupport.type, + SqlBuilder.isEqualTo(EventType.LAST_PING.id)) + .build() + .execute() + .stream() + .collect(Utils.toSingleton()); + + } catch (final Exception e) { + log.error("Unexpected error: ", e); + return null; + } } } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/PingIntervalClientIndicator.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/PingIntervalClientIndicator.java index 8ba2fb86..7e982fcd 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/PingIntervalClientIndicator.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/PingIntervalClientIndicator.java @@ -17,6 +17,7 @@ import org.springframework.stereotype.Component; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator.IndicatorType; import ch.ethz.seb.sebserver.gbl.model.session.IndicatorValueHolder; +import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.webservice.datalayer.batis.ClientEventExtentionMapper; @Lazy @@ -27,7 +28,7 @@ public final class PingIntervalClientIndicator extends AbstractPingIndicator { public PingIntervalClientIndicator(final ClientEventExtentionMapper clientEventExtentionMapper) { super(clientEventExtentionMapper); this.cachingEnabled = true; - this.currentValue = computeValueAt(DateTime.now(DateTimeZone.UTC).getMillis()); + this.currentValue = computeValueAt(Utils.getMillisecondsNow()); } @Override diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SebClientConnectionServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SebClientConnectionServiceImpl.java index 826ded12..3dec3ee6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SebClientConnectionServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SebClientConnectionServiceImpl.java @@ -277,6 +277,11 @@ public class SebClientConnectionServiceImpl implements SebClientConnectionServic updatedClientConnection); } + // notify ping handler about established connection + this.pingHandlingStrategy.initForConnection( + updatedClientConnection.id, + connectionToken); + return updatedClientConnection; }); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SingleServerPingHandler.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SingleServerPingHandler.java index 8c853ee4..d1e5d9ae 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SingleServerPingHandler.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SingleServerPingHandler.java @@ -38,4 +38,9 @@ public class SingleServerPingHandler implements PingHandlingStrategy { } } + @Override + public void initForConnection(final Long connectionId, final String connectionToken) { + // nothing to do here + } + } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceSecurityConfig.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceSecurityConfig.java index dc07444b..0dea295c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceSecurityConfig.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceSecurityConfig.java @@ -92,7 +92,7 @@ public class WebServiceSecurityConfig extends WebSecurityConfigurerAdapter { private String examAPIEndpoint; @Value("${management.endpoints.web.base-path}") private String actuatorEndpoint; - @Value("${sebserver.webservice.api.redirect.unauthorized}") + @Value("${sebserver.webservice.http.redirect.gui}") private String unauthorizedRedirect; @Value("${sebserver.webservice.api.admin.accessTokenValiditySeconds:3600}") diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceShutdown.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceShutdown.java new file mode 100644 index 00000000..ef848961 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/WebServiceShutdown.java @@ -0,0 +1,37 @@ +/* + * 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.weblayer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.context.ApplicationListener; +import org.springframework.context.event.ContextClosedEvent; + +public class WebServiceShutdown implements DisposableBean, ApplicationListener { + + private static final Logger log = LoggerFactory.getLogger(WebServiceShutdown.class); + + public WebServiceShutdown() { + // TODO Auto-generated constructor stub + } + + @Override + public void destroy() throws Exception { + log.info("SEB-Server Web-Service shutdown..."); + + } + + @Override + public void onApplicationEvent(final ContextClosedEvent event) { + log.info("SEB-Server Web-Service shutdown..."); + + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPIDiscoveryController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPIDiscoveryController.java index 99e4a134..5eb52e21 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPIDiscoveryController.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPIDiscoveryController.java @@ -21,21 +21,21 @@ import org.springframework.web.bind.annotation.RestController; import ch.ethz.seb.sebserver.gbl.api.API; import ch.ethz.seb.sebserver.gbl.api.ExamAPIDiscovery; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; -import ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig.SebClientConfigService; +import ch.ethz.seb.sebserver.webservice.WebserviceInfo; @WebServiceProfile @RestController @RequestMapping("${sebserver.webservice.api.exam.endpoint.discovery}") public class ExamAPIDiscoveryController { - private final SebClientConfigService sebClientConfigService; + private final WebserviceInfo webserviceInfo; private final String examAPI_V1_Endpoint; protected ExamAPIDiscoveryController( - final SebClientConfigService sebClientConfigService, + final WebserviceInfo webserviceInfo, @Value("${sebserver.webservice.api.exam.endpoint.v1}") final String examAPI_V1_Endpoint) { - this.sebClientConfigService = sebClientConfigService; + this.webserviceInfo = webserviceInfo; this.examAPI_V1_Endpoint = examAPI_V1_Endpoint; } @@ -43,7 +43,7 @@ public class ExamAPIDiscoveryController { @PostConstruct void init() { - final String serverURL = this.sebClientConfigService.getServerURL(); + final String serverURL = this.webserviceInfo.getServerURL(); this.DISCOVERY_INFO = new ExamAPIDiscovery( "Safe Exam Browser Server / Exam API Description", "This is a description of Safe Exam Browser Server's Exam API", diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/CachableJdbcTokenStore.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/CachableJdbcTokenStore.java index e2a4b739..a3ab3987 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/CachableJdbcTokenStore.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/CachableJdbcTokenStore.java @@ -8,6 +8,7 @@ package ch.ethz.seb.sebserver.webservice.weblayer.oauth; +import java.util.Arrays; import java.util.Collection; import javax.sql.DataSource; @@ -55,7 +56,9 @@ public class CachableJdbcTokenStore implements TokenStore { key = "#token", unless = "#result == null") public OAuth2Authentication readAuthentication(final OAuth2AccessToken token) { - System.out.println("********************* readAuthentication"); + if (log.isDebugEnabled()) { + log.debug("Read authentication from persistent and cache if available"); + } return this.jdbcTokenStore.readAuthentication(token); } @@ -75,6 +78,10 @@ public class CachableJdbcTokenStore implements TokenStore { cacheNames = CACHE_NAME, key = "#token") public void removeAccessToken(final OAuth2AccessToken token) { + if (log.isDebugEnabled()) { + log.debug("Evict token from cache and remove it also from persistent store"); + } + this.jdbcTokenStore.removeAccessToken(token); } @@ -113,11 +120,17 @@ public class CachableJdbcTokenStore implements TokenStore { return this.jdbcTokenStore.findTokensByClientId(clientId); } + /** Used do proper handle key generation on null-able authentication. + * If given OAuth2Authentication this returns null instead of throwing a + * NullPointerException. */ private static final class KeyGenerator extends DefaultAuthenticationKeyGenerator { @Override public String extractKey(final OAuth2Authentication authentication) { if (authentication == null) { + log.warn("Given OAuth2Authentication is null. Should not happen. Stack is: {}", + Arrays.toString(Thread.currentThread().getStackTrace())); + return null; } return super.extractKey(authentication); diff --git a/src/main/resources/config/application-demo.properties b/src/main/resources/config/application-demo.properties index 5e4f4dcf..57188f62 100644 --- a/src/main/resources/config/application-demo.properties +++ b/src/main/resources/config/application-demo.properties @@ -13,6 +13,8 @@ spring.datasource.platform=demo logging.file=log/sebserver.log sebserver.webservice.http.scheme=http +sebserver.webservice.http.server.name=ralph.ethz.ch +sebserver.webservice.http.redirect.gui=${sebserver.gui.entrypoint} sebserver.webservice.api.admin.clientId=guiClient sebserver.webservice.api.admin.endpoint=/admin-api/v1 sebserver.webservice.api.admin.accessTokenValiditySeconds=3600 @@ -21,7 +23,7 @@ sebserver.webservice.api.exam.endpoint=/exam-api sebserver.webservice.api.exam.endpoint.discovery=${sebserver.webservice.api.exam.endpoint}/discovery sebserver.webservice.api.exam.endpoint.v1=${sebserver.webservice.api.exam.endpoint}/v1 sebserver.webservice.api.exam.accessTokenValiditySeconds=86400 -sebserver.webservice.api.redirect.unauthorized=http://0.0.0.0:8080/gui +#sebserver.webservice.api.redirect.unauthorized=${sebserver.webservice.http.scheme}://${sebserver.webservice.http.server.name}:${server.port}${sebserver.gui.entrypoint} sebserver.webservice.api.pagination.maxPageSize=500 # comma separated list of known possible OpenEdX API access token request endpoints sebserver.webservice.lms.openedx.api.token.request.paths=/oauth2/access_token diff --git a/src/main/resources/config/application-dev-gui.properties b/src/main/resources/config/application-dev-gui.properties index ae47b6a6..3c3acb16 100644 --- a/src/main/resources/config/application-dev-gui.properties +++ b/src/main/resources/config/application-dev-gui.properties @@ -11,7 +11,7 @@ sebserver.gui.webservice.address=localhost sebserver.gui.webservice.port=8080 sebserver.gui.webservice.apipath=/admin-api/v1 # defines the polling interval that is used to poll the webservice for client connection data on a monitored exam page -sebserver.gui.webservice.poll-interval=200 +sebserver.gui.webservice.poll-interval=500 sebserver.gui.theme=css/sebserver.css diff --git a/src/main/resources/config/application-dev-ws.properties b/src/main/resources/config/application-dev-ws.properties index 0c6ccdcc..fd372390 100644 --- a/src/main/resources/config/application-dev-ws.properties +++ b/src/main/resources/config/application-dev-ws.properties @@ -14,7 +14,8 @@ spring.datasource.hikari.max-lifetime=600000 # webservice configuration sebserver.webservice.http.scheme=http -sebserver.webservice.http.server.name=localhost +sebserver.webservice.http.server.name=${server.address} +sebserver.webservice.http.redirect.gui=/gui sebserver.webservice.api.admin.endpoint=/admin-api/v1 sebserver.webservice.api.admin.accessTokenValiditySeconds=3600 sebserver.webservice.api.admin.refreshTokenValiditySeconds=-1 diff --git a/src/main/resources/config/application-dev.properties b/src/main/resources/config/application-dev.properties index 7f4217b7..081348b9 100644 --- a/src/main/resources/config/application-dev.properties +++ b/src/main/resources/config/application-dev.properties @@ -4,7 +4,7 @@ server.address=localhost server.port=8080 server.servlet.context-path=/ -sebserver.webservice.api.redirect.unauthorized=http://localhost:8080/gui +#sebserver.webservice.api.redirect.unauthorized=http://localhost:8080/gui diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 0026d481..30fe5caa 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -31,7 +31,8 @@ - + + @@ -59,6 +60,8 @@ + + diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 0c77e4c5..7d99a938 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -356,6 +356,7 @@ sebserver.clientconfig.list.action.no.modify.privilege=No Access: A SEB Client C sebserver.clientconfig.form.title.new=New Client Configuration sebserver.clientconfig.form.title=SEB Client Configuration sebserver.clientconfig.form.name=Name +sebserver.clientconfig.form.fallback-url=Fallback Start URL sebserver.clientconfig.form.date=Creation Date sebserver.clientconfig.form.encryptSecret=Configuration Password sebserver.clientconfig.form.encryptSecret.confirm=Confirm Password diff --git a/src/main/resources/schema-demo.sql b/src/main/resources/schema-demo.sql index c44a5a39..a995c8d1 100644 --- a/src/main/resources/schema-demo.sql +++ b/src/main/resources/schema-demo.sql @@ -449,14 +449,13 @@ CREATE TABLE IF NOT EXISTS `user_activity_log` ( DROP TABLE IF EXISTS `additional_attributes` ; CREATE TABLE IF NOT EXISTS `additional_attributes` ( - `id` BIGINT UNSIGNED NOT NULL, + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `entity_type` VARCHAR(45) NOT NULL, `entity_id` BIGINT UNSIGNED NOT NULL, `name` VARCHAR(255) NOT NULL, `value` VARCHAR(4000) NULL, PRIMARY KEY (`id`)) -; - +ENGINE = InnoDB; -- ----------------------------------------------------- -- Table `seb_client_configuration` diff --git a/src/main/resources/schema-dev.sql b/src/main/resources/schema-dev.sql index 777938b8..54f462c0 100644 --- a/src/main/resources/schema-dev.sql +++ b/src/main/resources/schema-dev.sql @@ -471,13 +471,13 @@ CREATE TABLE IF NOT EXISTS `user_activity_log` ( DROP TABLE IF EXISTS `additional_attributes` ; CREATE TABLE IF NOT EXISTS `additional_attributes` ( - `id` BIGINT UNSIGNED NOT NULL, + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, `entity_type` VARCHAR(45) NOT NULL, `entity_id` BIGINT UNSIGNED NOT NULL, `name` VARCHAR(255) NOT NULL, `value` VARCHAR(4000) NULL, PRIMARY KEY (`id`)) -; +ENGINE = InnoDB; -- ----------------------------------------------------- diff --git a/src/test/java/ch/ethz/seb/sebserver/HTTPClientBot.java b/src/test/java/ch/ethz/seb/sebserver/HTTPClientBot.java index deeb9068..890d8c0e 100644 --- a/src/test/java/ch/ethz/seb/sebserver/HTTPClientBot.java +++ b/src/test/java/ch/ethz/seb/sebserver/HTTPClientBot.java @@ -182,6 +182,7 @@ public class HTTPClientBot { log.error("ConnectionBot {} : Failed to request access-token: ", this.name, e); if (attempt >= HTTPClientBot.this.connectionAttempts) { log.error("ConnectionBot {} : Gave up afer {} connection attempts: ", this.name, attempt); + return; } } } diff --git a/src/test/java/ch/ethz/seb/sebserver/gui/integration/ClientConfigTest.java b/src/test/java/ch/ethz/seb/sebserver/gui/integration/ClientConfigTest.java index 41c54640..999a982e 100644 --- a/src/test/java/ch/ethz/seb/sebserver/gui/integration/ClientConfigTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/gui/integration/ClientConfigTest.java @@ -105,6 +105,7 @@ public class ClientConfigTest extends GuiIntegrationTest { config.institutionId, "new client config", null, + null, "password", null, null)) @@ -122,6 +123,7 @@ public class ClientConfigTest extends GuiIntegrationTest { config.institutionId, "new client config", null, + null, "password", "password", null)) diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java index cdbef32b..93f49c81 100644 --- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java @@ -14,6 +14,7 @@ import java.util.Collection; import java.util.List; import org.junit.Test; +import org.mybatis.dynamic.sql.SqlBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.Cache; import org.springframework.cache.Cache.ValueWrapper; @@ -28,8 +29,10 @@ import ch.ethz.seb.sebserver.gbl.api.APIMessage; import ch.ethz.seb.sebserver.gbl.api.APIMessage.ErrorMessage; import ch.ethz.seb.sebserver.gbl.api.JSONMapper; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator.IndicatorType; +import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent.EventType; import ch.ethz.seb.sebserver.gbl.model.session.IndicatorValue; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientConnectionRecordMapper; +import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientEventRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ClientEventRecordMapper; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ClientConnectionRecord; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ClientEventRecord; @@ -532,21 +535,17 @@ public class SebConnectionTest extends ExamAPIIntegrationTester { // check event stored on db List events = this.clientEventRecordMapper .selectByExample() + .where( + ClientEventRecordDynamicSqlSupport.type, + SqlBuilder.isNotEqualTo(EventType.LAST_PING.id)) .build() .execute(); assertFalse(events.isEmpty()); final ClientEventRecord clientEventRecord = events.get(0); - assertEquals( - "ClientEventRecord [" - + "Hash = -1088444763, " - + "id=1, " - + "connectionId=1, " - + "type=2, " - + "timestamp=1, " - + "numericValue=100.0000, " - + "text=testEvent1]", - clientEventRecord.toString()); + assertNotNull(clientEventRecord); + assertEquals(Long.valueOf(1), clientEventRecord.getTimestamp()); + assertEquals("testEvent1", clientEventRecord.getText()); // send another event sendEvent = super.sendEvent( diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties index 18b0c671..f1205305 100644 --- a/src/test/resources/application-test.properties +++ b/src/test/resources/application-test.properties @@ -11,6 +11,7 @@ spring.datasource.driver-class-name=org.h2.Driver spring.datasource.platform=test sebserver.webservice.http.scheme=http +sebserver.webservice.http.redirect.gui=/gui sebserver.webservice.api.admin.clientId=testClient sebserver.webservice.api.admin.clientSecret=testClient sebserver.webservice.api.admin.endpoint=/admin-api