zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-73 some fixes and preparing for LMS SEB restriction impl

Browse source
This commit is contained in:
anhefti 2019-11-01 13:46:52 +01:00
parent 9b9aa4625d
commit d1f80baa87
105 changed files with 1851 additions and 1159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -268,10 +268,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId> <artifactId>spring-boot-starter-cache</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId> <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId> <artifactId>jackson-dataformat-xml</artifactId>

2
src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java
View file

@ -2,7 +2,7 @@ package ch.ethz.seb.sebserver.gbl.api;
import javax.annotation.Generated; import javax.annotation.Generated;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-10-28T13:38:46.173+01:00") @Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-10-31T08:44:00.345+01:00")
public enum EntityType { public enum EntityType {
CONFIGURATION_ATTRIBUTE, CONFIGURATION_ATTRIBUTE,
CONFIGURATION_VALUE, CONFIGURATION_VALUE,

3
src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java
View file

@ -5,7 +5,7 @@ import javax.annotation.Generated;
/** Defines the global names of the domain model and domain model fields. /** 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 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.**/ * 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-10-28T13:38:46.113+01:00") @Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-10-31T08:44:00.255+01:00")
public interface Domain { public interface Domain {
interface CONFIGURATION_ATTRIBUTE { interface CONFIGURATION_ATTRIBUTE {
@ -105,6 +105,7 @@ public interface Domain {
String ATTR_QUIT_PASSWORD = "quitPassword"; String ATTR_QUIT_PASSWORD = "quitPassword";
String ATTR_BROWSER_KEYS = "browserKeys"; String ATTR_BROWSER_KEYS = "browserKeys";
String ATTR_STATUS = "status"; String ATTR_STATUS = "status";
String ATTR_LMS_SEB_RESTRICTION = "lmsSebRestriction";
String ATTR_UPDATING = "updating"; String ATTR_UPDATING = "updating";
String ATTR_LASTUPDATE = "lastupdate"; String ATTR_LASTUPDATE = "lastupdate";
String ATTR_ACTIVE = "active"; String ATTR_ACTIVE = "active";

32
src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java
View file

@ -49,6 +49,8 @@ public final class Exam implements GrantEntity {
null, null,
ExamStatus.FINISHED, ExamStatus.FINISHED,
Boolean.FALSE, Boolean.FALSE,
null,
Boolean.FALSE,
null); null);
public static final String FILTER_ATTR_TYPE = "type"; public static final String FILTER_ATTR_TYPE = "type";
@ -114,6 +116,12 @@ public final class Exam implements GrantEntity {
@JsonProperty(EXAM.ATTR_STATUS) @JsonProperty(EXAM.ATTR_STATUS)
public final ExamStatus status; public final ExamStatus status;
@JsonProperty(EXAM.ATTR_LMS_SEB_RESTRICTION)
public final Boolean lmsSebRestriction;
@JsonProperty(EXAM.ATTR_BROWSER_KEYS)
public final String browserExamKeys;
@JsonProperty(EXAM.ATTR_ACTIVE) @JsonProperty(EXAM.ATTR_ACTIVE)
public final Boolean active; public final Boolean active;
@ -136,6 +144,8 @@ public final class Exam implements GrantEntity {
@JsonProperty(EXAM.ATTR_OWNER) final String owner, @JsonProperty(EXAM.ATTR_OWNER) final String owner,
@JsonProperty(EXAM.ATTR_SUPPORTER) final Collection<String> supporter, @JsonProperty(EXAM.ATTR_SUPPORTER) final Collection<String> supporter,
@JsonProperty(EXAM.ATTR_STATUS) final ExamStatus status, @JsonProperty(EXAM.ATTR_STATUS) final ExamStatus status,
@JsonProperty(EXAM.ATTR_LMS_SEB_RESTRICTION) final Boolean lmsSebRestriction,
@JsonProperty(EXAM.ATTR_BROWSER_KEYS) final String browserExamKeys,
@JsonProperty(EXAM.ATTR_ACTIVE) final Boolean active, @JsonProperty(EXAM.ATTR_ACTIVE) final Boolean active,
@JsonProperty(EXAM.ATTR_LASTUPDATE) final String lastUpdate) { @JsonProperty(EXAM.ATTR_LASTUPDATE) final String lastUpdate) {
@ -152,7 +162,9 @@ public final class Exam implements GrantEntity {
this.quitPassword = quitPassword; this.quitPassword = quitPassword;
this.owner = owner; this.owner = owner;
this.status = (status != null) ? status : getStatusFromDate(startTime, endTime); this.status = (status != null) ? status : getStatusFromDate(startTime, endTime);
this.active = (active != null) ? active : Boolean.FALSE; this.lmsSebRestriction = (lmsSebRestriction != null) ? lmsSebRestriction : Boolean.TRUE;
this.browserExamKeys = browserExamKeys;
this.active = (active != null) ? active : Boolean.TRUE;
this.lastUpdate = lastUpdate; this.lastUpdate = lastUpdate;
this.supporter = (supporter != null) this.supporter = (supporter != null)
@ -178,6 +190,8 @@ public final class Exam implements GrantEntity {
EXAM.ATTR_STATUS, EXAM.ATTR_STATUS,
ExamStatus.class, ExamStatus.class,
getStatusFromDate(this.startTime, this.endTime)); getStatusFromDate(this.startTime, this.endTime));
this.lmsSebRestriction = mapper.getBoolean(EXAM.ATTR_LMS_SEB_RESTRICTION);
this.browserExamKeys = mapper.getString(EXAM.ATTR_BROWSER_KEYS);
this.active = mapper.getBoolean(EXAM.ATTR_ACTIVE); this.active = mapper.getBoolean(EXAM.ATTR_ACTIVE);
this.supporter = mapper.getStringSet(EXAM.ATTR_SUPPORTER); this.supporter = mapper.getStringSet(EXAM.ATTR_SUPPORTER);
this.lastUpdate = null; this.lastUpdate = null;
@ -201,6 +215,8 @@ public final class Exam implements GrantEntity {
this.quitPassword = null; this.quitPassword = null;
this.owner = null; this.owner = null;
this.status = (status != null) ? status : getStatusFromDate(this.startTime, this.endTime); this.status = (status != null) ? status : getStatusFromDate(this.startTime, this.endTime);
this.lmsSebRestriction = null;
this.browserExamKeys = null;
this.active = null; this.active = null;
this.supporter = null; this.supporter = null;
this.lastUpdate = null; this.lastUpdate = null;
@ -297,6 +313,14 @@ public final class Exam implements GrantEntity {
return this.status; return this.status;
} }
public Boolean getLmsSebRestriction() {
return this.lmsSebRestriction;
}
public String getBrowserExamKeys() {
return this.browserExamKeys;
}
public Boolean getActive() { public Boolean getActive() {
return this.active; return this.active;
} }
@ -332,8 +356,14 @@ public final class Exam implements GrantEntity {
builder.append(this.supporter); builder.append(this.supporter);
builder.append(", status="); builder.append(", status=");
builder.append(this.status); builder.append(this.status);
builder.append(", lmsSebRestriction=");
builder.append(this.lmsSebRestriction);
builder.append(", browserExamKeys=");
builder.append(this.browserExamKeys);
builder.append(", active="); builder.append(", active=");
builder.append(this.active); builder.append(this.active);
builder.append(", lastUpdate=");
builder.append(this.lastUpdate);
builder.append("]"); builder.append("]");
return builder.toString(); return builder.toString();
} }

22
src/main/java/ch/ethz/seb/sebserver/gbl/util/Pair.java Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package ch.ethz.seb.sebserver.gbl.util;
public class Pair<A, B> {
public final A a;
public final B b;
public Pair(final A a, final B b) {
super();
this.a = a;
this.b = b;
}
}

52
src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java
View file

@ -145,6 +145,7 @@ public class ExamForm implements TemplateComposer {
private final DownloadService downloadService; private final DownloadService downloadService;
private final String downloadFileName; private final String downloadFileName;
private final WidgetFactory widgetFactory; private final WidgetFactory widgetFactory;
private final RestService restService;
protected ExamForm( protected ExamForm(
final PageService pageService, final PageService pageService,
@ -157,24 +158,23 @@ public class ExamForm implements TemplateComposer {
this.downloadService = downloadService; this.downloadService = downloadService;
this.downloadFileName = downloadFileName; this.downloadFileName = downloadFileName;
this.widgetFactory = pageService.getWidgetFactory(); this.widgetFactory = pageService.getWidgetFactory();
this.restService = this.resourceService.getRestService();
} }
@Override @Override
public void compose(final PageContext pageContext) { public void compose(final PageContext pageContext) {
final CurrentUser currentUser = this.resourceService.getCurrentUser(); final CurrentUser currentUser = this.resourceService.getCurrentUser();
final RestService restService = this.resourceService.getRestService();
final I18nSupport i18nSupport = this.resourceService.getI18nSupport(); final I18nSupport i18nSupport = this.resourceService.getI18nSupport();
final EntityKey entityKey = pageContext.getEntityKey(); final EntityKey entityKey = pageContext.getEntityKey();
final EntityKey parentEntityKey = pageContext.getParentEntityKey();
final boolean readonly = pageContext.isReadonly(); final boolean readonly = pageContext.isReadonly();
final boolean importFromQuizData = BooleanUtils.toBoolean( final boolean importFromQuizData = BooleanUtils.toBoolean(
pageContext.getAttribute(AttributeKeys.IMPORT_FROM_QUIZ_DATA)); pageContext.getAttribute(AttributeKeys.IMPORT_FROM_QUIZ_DATA));
// get or create model data // get or create model data
final Exam exam = (importFromQuizData final Exam exam = (importFromQuizData
? createExamFromQuizData(entityKey, parentEntityKey, restService) ? createExamFromQuizData(pageContext)
: getExistingExam(entityKey, restService)) : getExistingExam(pageContext))
.get(pageContext::notifyError); .get(pageContext::notifyError);
if (exam == null) { if (exam == null) {
@ -190,7 +190,7 @@ public class ExamForm implements TemplateComposer {
// check exam consistency and inform the user if needed // check exam consistency and inform the user if needed
if (readonly) { if (readonly) {
restService.getBuilder(CheckExamConsistency.class) this.restService.getBuilder(CheckExamConsistency.class)
.withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId) .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId)
.call() .call()
.ifPresent(result -> showConsistencyChecks(result, formContext.getParent())); .ifPresent(result -> showConsistencyChecks(result, formContext.getParent()));
@ -286,8 +286,8 @@ public class ExamForm implements TemplateComposer {
this.resourceService::examSupporterResources)) this.resourceService::examSupporterResources))
.buildFor(importFromQuizData .buildFor(importFromQuizData
? restService.getRestCall(ImportAsExam.class) ? this.restService.getRestCall(ImportAsExam.class)
: restService.getRestCall(SaveExam.class)); : this.restService.getRestCall(SaveExam.class));
final PageActionBuilder actionBuilder = this.pageService.pageActionBuilder(formContext final PageActionBuilder actionBuilder = this.pageService.pageActionBuilder(formContext
.clearEntityKeys() .clearEntityKeys()
@ -320,7 +320,7 @@ public class ExamForm implements TemplateComposer {
CONFIG_LIST_TITLE_KEY); CONFIG_LIST_TITLE_KEY);
final EntityTable<ExamConfigurationMap> configurationTable = final EntityTable<ExamConfigurationMap> configurationTable =
this.pageService.entityTableBuilder(restService.getRestCall(GetExamConfigMappingsPage.class)) this.pageService.entityTableBuilder(this.restService.getRestCall(GetExamConfigMappingsPage.class))
.withRestCallAdapter(builder -> builder.withQueryParam( .withRestCallAdapter(builder -> builder.withQueryParam(
ExamConfigurationMap.FILTER_ATTR_EXAM_ID, ExamConfigurationMap.FILTER_ATTR_EXAM_ID,
entityKey.modelId)) entityKey.modelId))
@ -410,7 +410,7 @@ public class ExamForm implements TemplateComposer {
INDICATOR_LIST_TITLE_KEY); INDICATOR_LIST_TITLE_KEY);
final EntityTable<Indicator> indicatorTable = final EntityTable<Indicator> indicatorTable =
this.pageService.entityTableBuilder(restService.getRestCall(GetIndicatorPage.class)) this.pageService.entityTableBuilder(this.restService.getRestCall(GetIndicatorPage.class))
.withRestCallAdapter(builder -> builder.withQueryParam( .withRestCallAdapter(builder -> builder.withQueryParam(
Indicator.FILTER_ATTR_EXAM_ID, Indicator.FILTER_ATTR_EXAM_ID,
entityKey.modelId)) entityKey.modelId))
@ -493,11 +493,9 @@ public class ExamForm implements TemplateComposer {
private PageAction viewExamConfigPageAction(final EntityTable<ExamConfigurationMap> table) { private PageAction viewExamConfigPageAction(final EntityTable<ExamConfigurationMap> table) {
final PageActionBuilder actionBuilder = this.pageService.pageActionBuilder(table.getPageContext() return this.pageService.pageActionBuilder(table.getPageContext()
.clearEntityKeys() .clearEntityKeys()
.removeAttribute(AttributeKeys.IMPORT_FROM_QUIZ_DATA)); .removeAttribute(AttributeKeys.IMPORT_FROM_QUIZ_DATA))
return actionBuilder
.newAction(ActionDefinition.EXAM_CONFIGURATION_EXAM_CONFIG_VIEW_PROP) .newAction(ActionDefinition.EXAM_CONFIGURATION_EXAM_CONFIG_VIEW_PROP)
.withSelectionSupplier(() -> { .withSelectionSupplier(() -> {
final ExamConfigurationMap selectedROWData = table.getSelectedROWData(); final ExamConfigurationMap selectedROWData = table.getSelectedROWData();
@ -577,26 +575,28 @@ public class ExamForm implements TemplateComposer {
this.resourceService.getRestService() this.resourceService.getRestService()
.getBuilder(DeleteExamConfigMapping.class) .getBuilder(DeleteExamConfigMapping.class)
.withURIVariable(API.PARAM_MODEL_ID, examConfigMappingKey.modelId) .withURIVariable(API.PARAM_MODEL_ID, examConfigMappingKey.modelId)
.call(); .call()
.onError(error -> action.pageContext().notifyError(error));
return action; return action;
} }
private Result<Exam> getExistingExam(final EntityKey entityKey, final RestService restService) { private Result<Exam> getExistingExam(final PageContext pageContext) {
return restService.getBuilder(GetExam.class) final EntityKey entityKey = pageContext.getEntityKey();
return this.restService.getBuilder(GetExam.class)
.withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId) .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId)
.call(); .call()
.onError(error -> pageContext.notifyError(error));
} }
private Result<Exam> createExamFromQuizData( private Result<Exam> createExamFromQuizData(final PageContext pageContext) {
final EntityKey entityKey, final EntityKey entityKey = pageContext.getEntityKey();
final EntityKey parentEntityKey, final EntityKey parentEntityKey = pageContext.getParentEntityKey();
final RestService restService) { return this.restService.getBuilder(GetQuizData.class)
return restService.getBuilder(GetQuizData.class)
.withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId) .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId)
.withQueryParam(QuizData.QUIZ_ATTR_LMS_SETUP_ID, parentEntityKey.modelId) .withQueryParam(QuizData.QUIZ_ATTR_LMS_SETUP_ID, parentEntityKey.modelId)
.call() .call()
.map(quizzData -> new Exam(quizzData)); .map(quizzData -> new Exam(quizzData))
.onError(error -> pageContext.notifyError(error));
} }
private String indicatorTypeName(final Indicator indicator) { private String indicatorTypeName(final Indicator indicator) {
@ -619,9 +619,9 @@ public class ExamForm implements TemplateComposer {
.reduce( .reduce(
new StringBuilder(), new StringBuilder(),
(sb, threshold) -> sb.append(threshold.value) (sb, threshold) -> sb.append(threshold.value)
.append(":") .append(Constants.URL_PORT_SEPARATOR)
.append(threshold.color) .append(threshold.color)
.append("|"), .append(Constants.EMBEDDED_LIST_SEPARATOR),
(sb1, sb2) -> sb1.append(sb2)) (sb1, sb2) -> sb1.append(sb2))
.toString(); .toString();
} }

14
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageAction.java
View file

@ -8,6 +8,7 @@
package ch.ethz.seb.sebserver.gui.service.page.impl; package ch.ethz.seb.sebserver.gui.service.page.impl;
import java.util.Collections;
import java.util.Set; import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
@ -85,7 +86,7 @@ public final class PageAction {
public EntityKey getSingleSelection() { public EntityKey getSingleSelection() {
final Set<EntityKey> selection = getMultiSelection(); final Set<EntityKey> selection = getMultiSelection();
if (selection != null) { if (selection != null && selection.size() > 0) {
return selection.iterator().next(); return selection.iterator().next();
} }
@ -93,6 +94,7 @@ public final class PageAction {
} }
public Set<EntityKey> getMultiSelection() { public Set<EntityKey> getMultiSelection() {
try {
if (this.selectionSupplier != null) { if (this.selectionSupplier != null) {
final Set<EntityKey> selection = this.selectionSupplier.get(); final Set<EntityKey> selection = this.selectionSupplier.get();
if (selection.isEmpty()) { if (selection.isEmpty()) {
@ -100,7 +102,7 @@ public final class PageAction {
throw new PageMessageException(this.noSelectionMessage); throw new PageMessageException(this.noSelectionMessage);
} }
return null; return Collections.emptySet();
} }
return selection; return selection;
@ -110,7 +112,13 @@ public final class PageAction {
throw new PageMessageException(this.noSelectionMessage); throw new PageMessageException(this.noSelectionMessage);
} }
return null; return Collections.emptySet();
} catch (final Exception e) {
log.error("Unexpected error while trying to get current selection: ", e);
throw new PageMessageException(
"Unexpected error while trying to get current selection: "
+ e.getMessage());
}
} }
void applyAction(final Consumer<Result<PageAction>> callback) { void applyAction(final Consumer<Result<PageAction>> callback) {

30
src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionTable.java
View file

@ -13,11 +13,10 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -33,6 +32,8 @@ import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.TableItem;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.EntityType;
@ -80,7 +81,7 @@ public final class ClientConnectionTable {
private int tableWidth; private int tableWidth;
private boolean needsSort = false; private boolean needsSort = false;
private LinkedHashMap<Long, UpdatableTableItem> tableMapping; private LinkedHashMap<Long, UpdatableTableItem> tableMapping;
private final Set<String> sessionIds; private final MultiValueMap<String, Long> sessionIds;
public ClientConnectionTable( public ClientConnectionTable(
final PageService pageService, final PageService pageService,
@ -129,7 +130,7 @@ public final class ClientConnectionTable {
} }
this.tableMapping = new LinkedHashMap<>(); this.tableMapping = new LinkedHashMap<>();
this.sessionIds = new HashSet<>(); this.sessionIds = new LinkedMultiValueMap<>();
this.table.layout(); this.table.layout();
} }
@ -261,8 +262,6 @@ public final class ClientConnectionTable {
private ClientConnectionData connectionData; private ClientConnectionData connectionData;
private int[] thresholdColorIndices; private int[] thresholdColorIndices;
private boolean duplicateChecked = false; private boolean duplicateChecked = false;
private boolean duplicateMarked = false;
private boolean isDuplicate = false;
UpdatableTableItem(final Long connectionId) { UpdatableTableItem(final Long connectionId) {
this.connectionId = connectionId; this.connectionId = connectionId;
@ -297,13 +296,21 @@ public final class ClientConnectionTable {
} }
void updateDuplicateColor(final TableItem tableItem) { void updateDuplicateColor(final TableItem tableItem) {
if (this.isDuplicate && this.duplicateChecked && !this.duplicateMarked) { if (!this.duplicateChecked) {
return;
}
if (this.connectionData != null
&& StringUtils.isNotBlank(this.connectionData.clientConnection.userSessionId)) {
final List<Long> list =
ClientConnectionTable.this.sessionIds.get(this.connectionData.clientConnection.userSessionId);
if (list != null && list.size() > 1) {
tableItem.setBackground(0, ClientConnectionTable.this.statusData.color3); tableItem.setBackground(0, ClientConnectionTable.this.statusData.color3);
this.duplicateMarked = true;
} else { } else {
tableItem.setBackground(0, null); tableItem.setBackground(0, null);
} }
} }
}
void updateIndicatorValues(final TableItem tableItem) { void updateIndicatorValues(final TableItem tableItem) {
if (this.connectionData == null) { if (this.connectionData == null) {
@ -409,11 +416,8 @@ public final class ClientConnectionTable {
this.connectionData = connectionData; this.connectionData = connectionData;
if (!this.duplicateChecked && StringUtils.isNotBlank(connectionData.clientConnection.userSessionId)) { if (!this.duplicateChecked && StringUtils.isNotBlank(connectionData.clientConnection.userSessionId)) {
if (ClientConnectionTable.this.sessionIds.contains(connectionData.clientConnection.userSessionId)) { ClientConnectionTable.this.sessionIds.add(connectionData.clientConnection.userSessionId,
this.isDuplicate = true; this.connectionId);
} else {
ClientConnectionTable.this.sessionIds.add(connectionData.clientConnection.userSessionId);
}
this.duplicateChecked = true; this.duplicateChecked = true;
} }
} }

7
src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java
View file

@ -159,7 +159,12 @@ public class EntityTable<ROW extends Entity> {
final PageAction defaultAction = defaultActionFunction.apply(this); final PageAction defaultAction = defaultActionFunction.apply(this);
if (defaultAction != null) { if (defaultAction != null) {
this.table.addListener(SWT.MouseDoubleClick, event -> { this.table.addListener(SWT.MouseDoubleClick, event -> {
final EntityKey selection = getSingleSelection(); // if the action has its own selection function, apply this
EntityKey selection = defaultAction.getSingleSelection();
if (selection == null) {
// otherwise use current selection of this table
selection = getSingleSelection();
}
if (selection != null) { if (selection != null) {
this.pageService.executePageAction( this.pageService.executePageAction(
defaultAction.withEntityKey(selection)); defaultAction.withEntityKey(selection));

2
src/main/java/ch/ethz/seb/sebserver/webservice/WebserviceInfo.java
View file

@ -162,7 +162,7 @@ public class WebserviceInfo {
* E.g.: https://seb.server.ch:8080 * E.g.: https://seb.server.ch:8080
* *
* @return the server URL prefix */ * @return the server URL prefix */
public String getServerURL() { public String getExternalServerURL() {
return this.serverURLPrefix; return this.serverURLPrefix;
} }

14
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java
View file

@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class AdditionalAttributeRecordDynamicSqlSupport { public final class AdditionalAttributeRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source Table: additional_attributes")
public static final AdditionalAttributeRecord additionalAttributeRecord = new AdditionalAttributeRecord(); public static final AdditionalAttributeRecord additionalAttributeRecord = new AdditionalAttributeRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source field: additional_attributes.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source field: additional_attributes.id")
public static final SqlColumn<Long> id = additionalAttributeRecord.id; public static final SqlColumn<Long> id = additionalAttributeRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source field: additional_attributes.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source field: additional_attributes.entity_type")
public static final SqlColumn<String> entityType = additionalAttributeRecord.entityType; public static final SqlColumn<String> entityType = additionalAttributeRecord.entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source field: additional_attributes.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source field: additional_attributes.entity_id")
public static final SqlColumn<Long> entityId = additionalAttributeRecord.entityId; public static final SqlColumn<Long> entityId = additionalAttributeRecord.entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source field: additional_attributes.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source field: additional_attributes.name")
public static final SqlColumn<String> name = additionalAttributeRecord.name; public static final SqlColumn<String> name = additionalAttributeRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source field: additional_attributes.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source field: additional_attributes.value")
public static final SqlColumn<String> value = additionalAttributeRecord.value; public static final SqlColumn<String> value = additionalAttributeRecord.value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source Table: additional_attributes")
public static final class AdditionalAttributeRecord extends SqlTable { public static final class AdditionalAttributeRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface AdditionalAttributeRecordMapper { public interface AdditionalAttributeRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source Table: additional_attributes")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source Table: additional_attributes")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source Table: additional_attributes")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<AdditionalAttributeRecord> insertStatement); int insert(InsertStatementProvider<AdditionalAttributeRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.355+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source Table: additional_attributes")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -56,7 +56,7 @@ public interface AdditionalAttributeRecordMapper {
}) })
AdditionalAttributeRecord selectOne(SelectStatementProvider selectStatement); AdditionalAttributeRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source Table: additional_attributes")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -67,22 +67,22 @@ public interface AdditionalAttributeRecordMapper {
}) })
List<AdditionalAttributeRecord> selectMany(SelectStatementProvider selectStatement); List<AdditionalAttributeRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source Table: additional_attributes")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source Table: additional_attributes")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(additionalAttributeRecord); .from(additionalAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.560+01:00", comments="Source Table: additional_attributes")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord); return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.561+01:00", comments="Source Table: additional_attributes")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord) return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -90,7 +90,7 @@ public interface AdditionalAttributeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.561+01:00", comments="Source Table: additional_attributes")
default int insert(AdditionalAttributeRecord record) { default int insert(AdditionalAttributeRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(additionalAttributeRecord) .into(additionalAttributeRecord)
@ -102,7 +102,7 @@ public interface AdditionalAttributeRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.561+01:00", comments="Source Table: additional_attributes")
default int insertSelective(AdditionalAttributeRecord record) { default int insertSelective(AdditionalAttributeRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(additionalAttributeRecord) .into(additionalAttributeRecord)
@ -114,19 +114,19 @@ public interface AdditionalAttributeRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.561+01:00", comments="Source Table: additional_attributes")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<AdditionalAttributeRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<AdditionalAttributeRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, entityType, entityId, name, value) return SelectDSL.selectWithMapper(this::selectMany, id, entityType, entityId, name, value)
.from(additionalAttributeRecord); .from(additionalAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.561+01:00", comments="Source Table: additional_attributes")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<AdditionalAttributeRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<AdditionalAttributeRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, entityType, entityId, name, value) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, entityType, entityId, name, value)
.from(additionalAttributeRecord); .from(additionalAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.561+01:00", comments="Source Table: additional_attributes")
default AdditionalAttributeRecord selectByPrimaryKey(Long id_) { default AdditionalAttributeRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, entityType, entityId, name, value) return SelectDSL.selectWithMapper(this::selectOne, id, entityType, entityId, name, value)
.from(additionalAttributeRecord) .from(additionalAttributeRecord)
@ -135,7 +135,7 @@ public interface AdditionalAttributeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.561+01:00", comments="Source Table: additional_attributes")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(AdditionalAttributeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(AdditionalAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord)
.set(entityType).equalTo(record::getEntityType) .set(entityType).equalTo(record::getEntityType)
@ -144,7 +144,7 @@ public interface AdditionalAttributeRecordMapper {
.set(value).equalTo(record::getValue); .set(value).equalTo(record::getValue);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.561+01:00", comments="Source Table: additional_attributes")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(AdditionalAttributeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(AdditionalAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord)
.set(entityType).equalToWhenPresent(record::getEntityType) .set(entityType).equalToWhenPresent(record::getEntityType)
@ -153,7 +153,7 @@ public interface AdditionalAttributeRecordMapper {
.set(value).equalToWhenPresent(record::getValue); .set(value).equalToWhenPresent(record::getValue);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.561+01:00", comments="Source Table: additional_attributes")
default int updateByPrimaryKey(AdditionalAttributeRecord record) { default int updateByPrimaryKey(AdditionalAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord)
.set(entityType).equalTo(record::getEntityType) .set(entityType).equalTo(record::getEntityType)
@ -165,7 +165,7 @@ public interface AdditionalAttributeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.356+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.561+01:00", comments="Source Table: additional_attributes")
default int updateByPrimaryKeySelective(AdditionalAttributeRecord record) { default int updateByPrimaryKeySelective(AdditionalAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord) return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord)
.set(entityType).equalToWhenPresent(record::getEntityType) .set(entityType).equalToWhenPresent(record::getEntityType)

22
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java
View file

@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ClientConnectionRecordDynamicSqlSupport { public final class ClientConnectionRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source Table: client_connection")
public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.524+01:00", comments="Source field: client_connection.id")
public static final SqlColumn<Long> id = clientConnectionRecord.id; public static final SqlColumn<Long> id = clientConnectionRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source field: client_connection.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.524+01:00", comments="Source field: client_connection.institution_id")
public static final SqlColumn<Long> institutionId = clientConnectionRecord.institutionId; public static final SqlColumn<Long> institutionId = clientConnectionRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.524+01:00", comments="Source field: client_connection.exam_id")
public static final SqlColumn<Long> examId = clientConnectionRecord.examId; public static final SqlColumn<Long> examId = clientConnectionRecord.examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.524+01:00", comments="Source field: client_connection.status")
public static final SqlColumn<String> status = clientConnectionRecord.status; public static final SqlColumn<String> status = clientConnectionRecord.status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.524+01:00", comments="Source field: client_connection.connection_token")
public static final SqlColumn<String> connectionToken = clientConnectionRecord.connectionToken; public static final SqlColumn<String> connectionToken = clientConnectionRecord.connectionToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source field: client_connection.exam_user_session_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.524+01:00", comments="Source field: client_connection.exam_user_session_id")
public static final SqlColumn<String> examUserSessionId = clientConnectionRecord.examUserSessionId; public static final SqlColumn<String> examUserSessionId = clientConnectionRecord.examUserSessionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.524+01:00", comments="Source field: client_connection.client_address")
public static final SqlColumn<String> clientAddress = clientConnectionRecord.clientAddress; public static final SqlColumn<String> clientAddress = clientConnectionRecord.clientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.524+01:00", comments="Source field: client_connection.virtual_client_address")
public static final SqlColumn<String> virtualClientAddress = clientConnectionRecord.virtualClientAddress; public static final SqlColumn<String> virtualClientAddress = clientConnectionRecord.virtualClientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source field: client_connection.creation_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.524+01:00", comments="Source field: client_connection.creation_time")
public static final SqlColumn<Long> creationTime = clientConnectionRecord.creationTime; public static final SqlColumn<Long> creationTime = clientConnectionRecord.creationTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source Table: client_connection")
public static final class ClientConnectionRecord extends SqlTable { public static final class ClientConnectionRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ClientConnectionRecordMapper { public interface ClientConnectionRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.524+01:00", comments="Source Table: client_connection")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.525+01:00", comments="Source Table: client_connection")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.525+01:00", comments="Source Table: client_connection")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ClientConnectionRecord> insertStatement); int insert(InsertStatementProvider<ClientConnectionRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.525+01:00", comments="Source Table: client_connection")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -60,7 +60,7 @@ public interface ClientConnectionRecordMapper {
}) })
ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); ClientConnectionRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.525+01:00", comments="Source Table: client_connection")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -75,22 +75,22 @@ public interface ClientConnectionRecordMapper {
}) })
List<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement); List<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.525+01:00", comments="Source Table: client_connection")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.525+01:00", comments="Source Table: client_connection")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(clientConnectionRecord); .from(clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.525+01:00", comments="Source Table: client_connection")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord); return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.525+01:00", comments="Source Table: client_connection")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord) return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -98,7 +98,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.525+01:00", comments="Source Table: client_connection")
default int insert(ClientConnectionRecord record) { default int insert(ClientConnectionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientConnectionRecord) .into(clientConnectionRecord)
@ -114,7 +114,7 @@ public interface ClientConnectionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.525+01:00", comments="Source Table: client_connection")
default int insertSelective(ClientConnectionRecord record) { default int insertSelective(ClientConnectionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientConnectionRecord) .into(clientConnectionRecord)
@ -130,19 +130,19 @@ public interface ClientConnectionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.526+01:00", comments="Source Table: client_connection")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime)
.from(clientConnectionRecord); .from(clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.317+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.526+01:00", comments="Source Table: client_connection")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime)
.from(clientConnectionRecord); .from(clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.526+01:00", comments="Source Table: client_connection")
default ClientConnectionRecord selectByPrimaryKey(Long id_) { default ClientConnectionRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime)
.from(clientConnectionRecord) .from(clientConnectionRecord)
@ -151,7 +151,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.526+01:00", comments="Source Table: client_connection")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientConnectionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -164,7 +164,7 @@ public interface ClientConnectionRecordMapper {
.set(creationTime).equalTo(record::getCreationTime); .set(creationTime).equalTo(record::getCreationTime);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.526+01:00", comments="Source Table: client_connection")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientConnectionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -177,7 +177,7 @@ public interface ClientConnectionRecordMapper {
.set(creationTime).equalToWhenPresent(record::getCreationTime); .set(creationTime).equalToWhenPresent(record::getCreationTime);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.526+01:00", comments="Source Table: client_connection")
default int updateByPrimaryKey(ClientConnectionRecord record) { default int updateByPrimaryKey(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -193,7 +193,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.526+01:00", comments="Source Table: client_connection")
default int updateByPrimaryKeySelective(ClientConnectionRecord record) { default int updateByPrimaryKeySelective(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

18
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java
View file

@ -7,31 +7,31 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ClientEventRecordDynamicSqlSupport { public final class ClientEventRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.320+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.528+01:00", comments="Source Table: client_event")
public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); public static final ClientEventRecord clientEventRecord = new ClientEventRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.320+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source field: client_event.id")
public static final SqlColumn<Long> id = clientEventRecord.id; public static final SqlColumn<Long> id = clientEventRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.320+01:00", comments="Source field: client_event.connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source field: client_event.connection_id")
public static final SqlColumn<Long> connectionId = clientEventRecord.connectionId; public static final SqlColumn<Long> connectionId = clientEventRecord.connectionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.320+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source field: client_event.type")
public static final SqlColumn<Integer> type = clientEventRecord.type; public static final SqlColumn<Integer> type = clientEventRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.320+01:00", comments="Source field: client_event.client_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source field: client_event.client_time")
public static final SqlColumn<Long> clientTime = clientEventRecord.clientTime; public static final SqlColumn<Long> clientTime = clientEventRecord.clientTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.320+01:00", comments="Source field: client_event.server_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source field: client_event.server_time")
public static final SqlColumn<Long> serverTime = clientEventRecord.serverTime; public static final SqlColumn<Long> serverTime = clientEventRecord.serverTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.320+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source field: client_event.numeric_value")
public static final SqlColumn<BigDecimal> numericValue = clientEventRecord.numericValue; public static final SqlColumn<BigDecimal> numericValue = clientEventRecord.numericValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.320+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source field: client_event.text")
public static final SqlColumn<String> text = clientEventRecord.text; public static final SqlColumn<String> text = clientEventRecord.text;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.320+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source Table: client_event")
public static final class ClientEventRecord extends SqlTable { public static final class ClientEventRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java
View file

@ -32,19 +32,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ClientEventRecordMapper { public interface ClientEventRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source Table: client_event")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source Table: client_event")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source Table: client_event")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
int insert(InsertStatementProvider<ClientEventRecord> insertStatement); int insert(InsertStatementProvider<ClientEventRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.529+01:00", comments="Source Table: client_event")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -57,7 +57,7 @@ public interface ClientEventRecordMapper {
}) })
ClientEventRecord selectOne(SelectStatementProvider selectStatement); ClientEventRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -70,22 +70,22 @@ public interface ClientEventRecordMapper {
}) })
List<ClientEventRecord> selectMany(SelectStatementProvider selectStatement); List<ClientEventRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(clientEventRecord); .from(clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord); return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord) return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -93,7 +93,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default int insert(ClientEventRecord record) { default int insert(ClientEventRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientEventRecord) .into(clientEventRecord)
@ -108,7 +108,7 @@ public interface ClientEventRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default int insertSelective(ClientEventRecord record) { default int insertSelective(ClientEventRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientEventRecord) .into(clientEventRecord)
@ -123,19 +123,19 @@ public interface ClientEventRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, type, clientTime, serverTime, numericValue, text) return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, type, clientTime, serverTime, numericValue, text)
.from(clientEventRecord); .from(clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, type, clientTime, serverTime, numericValue, text) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, type, clientTime, serverTime, numericValue, text)
.from(clientEventRecord); .from(clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default ClientEventRecord selectByPrimaryKey(Long id_) { default ClientEventRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, type, clientTime, serverTime, numericValue, text) return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, type, clientTime, serverTime, numericValue, text)
.from(clientEventRecord) .from(clientEventRecord)
@ -144,7 +144,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.321+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientEventRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(id).equalTo(record::getId) .set(id).equalTo(record::getId)
@ -156,7 +156,7 @@ public interface ClientEventRecordMapper {
.set(text).equalTo(record::getText); .set(text).equalTo(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.322+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientEventRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(id).equalToWhenPresent(record::getId) .set(id).equalToWhenPresent(record::getId)
@ -168,7 +168,7 @@ public interface ClientEventRecordMapper {
.set(text).equalToWhenPresent(record::getText); .set(text).equalToWhenPresent(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.322+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.530+01:00", comments="Source Table: client_event")
default int updateByPrimaryKey(ClientEventRecord record) { default int updateByPrimaryKey(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(connectionId).equalTo(record::getConnectionId) .set(connectionId).equalTo(record::getConnectionId)
@ -182,7 +182,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.322+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source Table: client_event")
default int updateByPrimaryKeySelective(ClientEventRecord record) { default int updateByPrimaryKeySelective(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(connectionId).equalToWhenPresent(record::getConnectionId) .set(connectionId).equalToWhenPresent(record::getConnectionId)

20
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java
View file

@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationAttributeRecordDynamicSqlSupport { public final class ConfigurationAttributeRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.069+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.204+01:00", comments="Source Table: configuration_attribute")
public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.072+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.210+01:00", comments="Source field: configuration_attribute.id")
public static final SqlColumn<Long> id = configurationAttributeRecord.id; public static final SqlColumn<Long> id = configurationAttributeRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.073+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.212+01:00", comments="Source field: configuration_attribute.name")
public static final SqlColumn<String> name = configurationAttributeRecord.name; public static final SqlColumn<String> name = configurationAttributeRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.074+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.212+01:00", comments="Source field: configuration_attribute.type")
public static final SqlColumn<String> type = configurationAttributeRecord.type; public static final SqlColumn<String> type = configurationAttributeRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.074+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.212+01:00", comments="Source field: configuration_attribute.parent_id")
public static final SqlColumn<Long> parentId = configurationAttributeRecord.parentId; public static final SqlColumn<Long> parentId = configurationAttributeRecord.parentId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.074+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.213+01:00", comments="Source field: configuration_attribute.resources")
public static final SqlColumn<String> resources = configurationAttributeRecord.resources; public static final SqlColumn<String> resources = configurationAttributeRecord.resources;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.074+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.213+01:00", comments="Source field: configuration_attribute.validator")
public static final SqlColumn<String> validator = configurationAttributeRecord.validator; public static final SqlColumn<String> validator = configurationAttributeRecord.validator;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.075+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.213+01:00", comments="Source field: configuration_attribute.dependencies")
public static final SqlColumn<String> dependencies = configurationAttributeRecord.dependencies; public static final SqlColumn<String> dependencies = configurationAttributeRecord.dependencies;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.075+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.213+01:00", comments="Source field: configuration_attribute.default_value")
public static final SqlColumn<String> defaultValue = configurationAttributeRecord.defaultValue; public static final SqlColumn<String> defaultValue = configurationAttributeRecord.defaultValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.072+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.209+01:00", comments="Source Table: configuration_attribute")
public static final class ConfigurationAttributeRecord extends SqlTable { public static final class ConfigurationAttributeRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ConfigurationAttributeRecordMapper { public interface ConfigurationAttributeRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.076+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.215+01:00", comments="Source Table: configuration_attribute")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.078+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.217+01:00", comments="Source Table: configuration_attribute")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.078+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.218+01:00", comments="Source Table: configuration_attribute")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ConfigurationAttributeRecord> insertStatement); int insert(InsertStatementProvider<ConfigurationAttributeRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.080+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.221+01:00", comments="Source Table: configuration_attribute")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -59,7 +59,7 @@ public interface ConfigurationAttributeRecordMapper {
}) })
ConfigurationAttributeRecord selectOne(SelectStatementProvider selectStatement); ConfigurationAttributeRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.081+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.223+01:00", comments="Source Table: configuration_attribute")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -73,22 +73,22 @@ public interface ConfigurationAttributeRecordMapper {
}) })
List<ConfigurationAttributeRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationAttributeRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.082+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.224+01:00", comments="Source Table: configuration_attribute")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.083+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.225+01:00", comments="Source Table: configuration_attribute")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(configurationAttributeRecord); .from(configurationAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.083+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.226+01:00", comments="Source Table: configuration_attribute")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord); return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.084+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.227+01:00", comments="Source Table: configuration_attribute")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -96,7 +96,7 @@ public interface ConfigurationAttributeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.085+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.228+01:00", comments="Source Table: configuration_attribute")
default int insert(ConfigurationAttributeRecord record) { default int insert(ConfigurationAttributeRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationAttributeRecord) .into(configurationAttributeRecord)
@ -111,7 +111,7 @@ public interface ConfigurationAttributeRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.086+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.230+01:00", comments="Source Table: configuration_attribute")
default int insertSelective(ConfigurationAttributeRecord record) { default int insertSelective(ConfigurationAttributeRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationAttributeRecord) .into(configurationAttributeRecord)
@ -126,19 +126,19 @@ public interface ConfigurationAttributeRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.087+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.232+01:00", comments="Source Table: configuration_attribute")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) return SelectDSL.selectWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue)
.from(configurationAttributeRecord); .from(configurationAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.089+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.234+01:00", comments="Source Table: configuration_attribute")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue)
.from(configurationAttributeRecord); .from(configurationAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.090+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.236+01:00", comments="Source Table: configuration_attribute")
default ConfigurationAttributeRecord selectByPrimaryKey(Long id_) { default ConfigurationAttributeRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, name, type, parentId, resources, validator, dependencies, defaultValue) return SelectDSL.selectWithMapper(this::selectOne, id, name, type, parentId, resources, validator, dependencies, defaultValue)
.from(configurationAttributeRecord) .from(configurationAttributeRecord)
@ -147,7 +147,7 @@ public interface ConfigurationAttributeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.091+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.237+01:00", comments="Source Table: configuration_attribute")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationAttributeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -159,7 +159,7 @@ public interface ConfigurationAttributeRecordMapper {
.set(defaultValue).equalTo(record::getDefaultValue); .set(defaultValue).equalTo(record::getDefaultValue);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.093+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.239+01:00", comments="Source Table: configuration_attribute")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationAttributeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)
@ -171,7 +171,7 @@ public interface ConfigurationAttributeRecordMapper {
.set(defaultValue).equalToWhenPresent(record::getDefaultValue); .set(defaultValue).equalToWhenPresent(record::getDefaultValue);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.094+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.240+01:00", comments="Source Table: configuration_attribute")
default int updateByPrimaryKey(ConfigurationAttributeRecord record) { default int updateByPrimaryKey(ConfigurationAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -186,7 +186,7 @@ public interface ConfigurationAttributeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.096+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.242+01:00", comments="Source Table: configuration_attribute")
default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) { default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)

20
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java
View file

@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationNodeRecordDynamicSqlSupport { public final class ConfigurationNodeRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.292+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.485+01:00", comments="Source Table: configuration_node")
public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.292+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.487+01:00", comments="Source field: configuration_node.id")
public static final SqlColumn<Long> id = configurationNodeRecord.id; public static final SqlColumn<Long> id = configurationNodeRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.292+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.487+01:00", comments="Source field: configuration_node.institution_id")
public static final SqlColumn<Long> institutionId = configurationNodeRecord.institutionId; public static final SqlColumn<Long> institutionId = configurationNodeRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.292+01:00", comments="Source field: configuration_node.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.487+01:00", comments="Source field: configuration_node.template_id")
public static final SqlColumn<Long> templateId = configurationNodeRecord.templateId; public static final SqlColumn<Long> templateId = configurationNodeRecord.templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.292+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.487+01:00", comments="Source field: configuration_node.owner")
public static final SqlColumn<String> owner = configurationNodeRecord.owner; public static final SqlColumn<String> owner = configurationNodeRecord.owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.292+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.488+01:00", comments="Source field: configuration_node.name")
public static final SqlColumn<String> name = configurationNodeRecord.name; public static final SqlColumn<String> name = configurationNodeRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.293+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.490+01:00", comments="Source field: configuration_node.description")
public static final SqlColumn<String> description = configurationNodeRecord.description; public static final SqlColumn<String> description = configurationNodeRecord.description;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.294+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.491+01:00", comments="Source field: configuration_node.type")
public static final SqlColumn<String> type = configurationNodeRecord.type; public static final SqlColumn<String> type = configurationNodeRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.294+01:00", comments="Source field: configuration_node.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.491+01:00", comments="Source field: configuration_node.status")
public static final SqlColumn<String> status = configurationNodeRecord.status; public static final SqlColumn<String> status = configurationNodeRecord.status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.292+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.487+01:00", comments="Source Table: configuration_node")
public static final class ConfigurationNodeRecord extends SqlTable { public static final class ConfigurationNodeRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ConfigurationNodeRecordMapper { public interface ConfigurationNodeRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.295+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.491+01:00", comments="Source Table: configuration_node")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.295+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.491+01:00", comments="Source Table: configuration_node")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.295+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.491+01:00", comments="Source Table: configuration_node")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ConfigurationNodeRecord> insertStatement); int insert(InsertStatementProvider<ConfigurationNodeRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.295+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.491+01:00", comments="Source Table: configuration_node")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -59,7 +59,7 @@ public interface ConfigurationNodeRecordMapper {
}) })
ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement); ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.295+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.492+01:00", comments="Source Table: configuration_node")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -73,22 +73,22 @@ public interface ConfigurationNodeRecordMapper {
}) })
List<ConfigurationNodeRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationNodeRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.295+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.492+01:00", comments="Source Table: configuration_node")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.295+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.492+01:00", comments="Source Table: configuration_node")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(configurationNodeRecord); .from(configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.296+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.492+01:00", comments="Source Table: configuration_node")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord); return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.296+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.492+01:00", comments="Source Table: configuration_node")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -96,7 +96,7 @@ public interface ConfigurationNodeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.296+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.493+01:00", comments="Source Table: configuration_node")
default int insert(ConfigurationNodeRecord record) { default int insert(ConfigurationNodeRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationNodeRecord) .into(configurationNodeRecord)
@ -111,7 +111,7 @@ public interface ConfigurationNodeRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.296+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.493+01:00", comments="Source Table: configuration_node")
default int insertSelective(ConfigurationNodeRecord record) { default int insertSelective(ConfigurationNodeRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationNodeRecord) .into(configurationNodeRecord)
@ -126,19 +126,19 @@ public interface ConfigurationNodeRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.296+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.493+01:00", comments="Source Table: configuration_node")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status)
.from(configurationNodeRecord); .from(configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.296+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.493+01:00", comments="Source Table: configuration_node")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status)
.from(configurationNodeRecord); .from(configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.296+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.493+01:00", comments="Source Table: configuration_node")
default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { default ConfigurationNodeRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, templateId, owner, name, description, type, status) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, templateId, owner, name, description, type, status)
.from(configurationNodeRecord) .from(configurationNodeRecord)
@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.296+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.493+01:00", comments="Source Table: configuration_node")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationNodeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -159,7 +159,7 @@ public interface ConfigurationNodeRecordMapper {
.set(status).equalTo(record::getStatus); .set(status).equalTo(record::getStatus);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.296+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.495+01:00", comments="Source Table: configuration_node")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationNodeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -171,7 +171,7 @@ public interface ConfigurationNodeRecordMapper {
.set(status).equalToWhenPresent(record::getStatus); .set(status).equalToWhenPresent(record::getStatus);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.297+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.498+01:00", comments="Source Table: configuration_node")
default int updateByPrimaryKey(ConfigurationNodeRecord record) { default int updateByPrimaryKey(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -186,7 +186,7 @@ public interface ConfigurationNodeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.297+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.499+01:00", comments="Source Table: configuration_node")
default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) { default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

16
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java
View file

@ -7,28 +7,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationRecordDynamicSqlSupport { public final class ConfigurationRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.283+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.478+01:00", comments="Source Table: configuration")
public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); public static final ConfigurationRecord configurationRecord = new ConfigurationRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.284+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.479+01:00", comments="Source field: configuration.id")
public static final SqlColumn<Long> id = configurationRecord.id; public static final SqlColumn<Long> id = configurationRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.284+01:00", comments="Source field: configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.479+01:00", comments="Source field: configuration.institution_id")
public static final SqlColumn<Long> institutionId = configurationRecord.institutionId; public static final SqlColumn<Long> institutionId = configurationRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.284+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.479+01:00", comments="Source field: configuration.configuration_node_id")
public static final SqlColumn<Long> configurationNodeId = configurationRecord.configurationNodeId; public static final SqlColumn<Long> configurationNodeId = configurationRecord.configurationNodeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.285+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.480+01:00", comments="Source field: configuration.version")
public static final SqlColumn<String> version = configurationRecord.version; public static final SqlColumn<String> version = configurationRecord.version;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.285+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.480+01:00", comments="Source field: configuration.version_date")
public static final SqlColumn<DateTime> versionDate = configurationRecord.versionDate; public static final SqlColumn<DateTime> versionDate = configurationRecord.versionDate;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.286+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.480+01:00", comments="Source field: configuration.followup")
public static final SqlColumn<Integer> followup = configurationRecord.followup; public static final SqlColumn<Integer> followup = configurationRecord.followup;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.283+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.479+01:00", comments="Source Table: configuration")
public static final class ConfigurationRecord extends SqlTable { public static final class ConfigurationRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java
View file

@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ConfigurationRecordMapper { public interface ConfigurationRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.286+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.481+01:00", comments="Source Table: configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.287+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.481+01:00", comments="Source Table: configuration")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.287+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.481+01:00", comments="Source Table: configuration")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ConfigurationRecord> insertStatement); int insert(InsertStatementProvider<ConfigurationRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.287+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.481+01:00", comments="Source Table: configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -59,7 +59,7 @@ public interface ConfigurationRecordMapper {
}) })
ConfigurationRecord selectOne(SelectStatementProvider selectStatement); ConfigurationRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.287+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.481+01:00", comments="Source Table: configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -71,22 +71,22 @@ public interface ConfigurationRecordMapper {
}) })
List<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.287+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.481+01:00", comments="Source Table: configuration")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.287+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.481+01:00", comments="Source Table: configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(configurationRecord); .from(configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.287+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.481+01:00", comments="Source Table: configuration")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.288+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.482+01:00", comments="Source Table: configuration")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -94,7 +94,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.288+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.482+01:00", comments="Source Table: configuration")
default int insert(ConfigurationRecord record) { default int insert(ConfigurationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationRecord) .into(configurationRecord)
@ -107,7 +107,7 @@ public interface ConfigurationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.288+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.482+01:00", comments="Source Table: configuration")
default int insertSelective(ConfigurationRecord record) { default int insertSelective(ConfigurationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationRecord) .into(configurationRecord)
@ -120,19 +120,19 @@ public interface ConfigurationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.288+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.482+01:00", comments="Source Table: configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup)
.from(configurationRecord); .from(configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.288+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.482+01:00", comments="Source Table: configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup)
.from(configurationRecord); .from(configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.288+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.482+01:00", comments="Source Table: configuration")
default ConfigurationRecord selectByPrimaryKey(Long id_) { default ConfigurationRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationNodeId, version, versionDate, followup) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationNodeId, version, versionDate, followup)
.from(configurationRecord) .from(configurationRecord)
@ -141,7 +141,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.288+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.482+01:00", comments="Source Table: configuration")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -151,7 +151,7 @@ public interface ConfigurationRecordMapper {
.set(followup).equalTo(record::getFollowup); .set(followup).equalTo(record::getFollowup);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.288+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.483+01:00", comments="Source Table: configuration")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -161,7 +161,7 @@ public interface ConfigurationRecordMapper {
.set(followup).equalToWhenPresent(record::getFollowup); .set(followup).equalToWhenPresent(record::getFollowup);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.289+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.483+01:00", comments="Source Table: configuration")
default int updateByPrimaryKey(ConfigurationRecord record) { default int updateByPrimaryKey(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -174,7 +174,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.289+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.483+01:00", comments="Source Table: configuration")
default int updateByPrimaryKeySelective(ConfigurationRecord record) { default int updateByPrimaryKeySelective(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

16
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java
View file

@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationValueRecordDynamicSqlSupport { public final class ConfigurationValueRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.252+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.444+01:00", comments="Source Table: configuration_value")
public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.253+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.444+01:00", comments="Source field: configuration_value.id")
public static final SqlColumn<Long> id = configurationValueRecord.id; public static final SqlColumn<Long> id = configurationValueRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.253+01:00", comments="Source field: configuration_value.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.444+01:00", comments="Source field: configuration_value.institution_id")
public static final SqlColumn<Long> institutionId = configurationValueRecord.institutionId; public static final SqlColumn<Long> institutionId = configurationValueRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.253+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.444+01:00", comments="Source field: configuration_value.configuration_id")
public static final SqlColumn<Long> configurationId = configurationValueRecord.configurationId; public static final SqlColumn<Long> configurationId = configurationValueRecord.configurationId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.253+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.445+01:00", comments="Source field: configuration_value.configuration_attribute_id")
public static final SqlColumn<Long> configurationAttributeId = configurationValueRecord.configurationAttributeId; public static final SqlColumn<Long> configurationAttributeId = configurationValueRecord.configurationAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.253+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.445+01:00", comments="Source field: configuration_value.list_index")
public static final SqlColumn<Integer> listIndex = configurationValueRecord.listIndex; public static final SqlColumn<Integer> listIndex = configurationValueRecord.listIndex;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.253+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.445+01:00", comments="Source field: configuration_value.value")
public static final SqlColumn<String> value = configurationValueRecord.value; public static final SqlColumn<String> value = configurationValueRecord.value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.253+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.444+01:00", comments="Source Table: configuration_value")
public static final class ConfigurationValueRecord extends SqlTable { public static final class ConfigurationValueRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java
View file

@ -31,19 +31,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ConfigurationValueRecordMapper { public interface ConfigurationValueRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.254+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.445+01:00", comments="Source Table: configuration_value")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.254+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.445+01:00", comments="Source Table: configuration_value")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.254+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.445+01:00", comments="Source Table: configuration_value")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
int insert(InsertStatementProvider<ConfigurationValueRecord> insertStatement); int insert(InsertStatementProvider<ConfigurationValueRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.254+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.445+01:00", comments="Source Table: configuration_value")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -55,7 +55,7 @@ public interface ConfigurationValueRecordMapper {
}) })
ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement); ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.254+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.445+01:00", comments="Source Table: configuration_value")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -67,22 +67,22 @@ public interface ConfigurationValueRecordMapper {
}) })
List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.254+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.446+01:00", comments="Source Table: configuration_value")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.254+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.446+01:00", comments="Source Table: configuration_value")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(configurationValueRecord); .from(configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.255+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.446+01:00", comments="Source Table: configuration_value")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord); return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.255+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.446+01:00", comments="Source Table: configuration_value")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -90,7 +90,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.255+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.446+01:00", comments="Source Table: configuration_value")
default int insert(ConfigurationValueRecord record) { default int insert(ConfigurationValueRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationValueRecord) .into(configurationValueRecord)
@ -104,7 +104,7 @@ public interface ConfigurationValueRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.255+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.446+01:00", comments="Source Table: configuration_value")
default int insertSelective(ConfigurationValueRecord record) { default int insertSelective(ConfigurationValueRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationValueRecord) .into(configurationValueRecord)
@ -118,19 +118,19 @@ public interface ConfigurationValueRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.255+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.446+01:00", comments="Source Table: configuration_value")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value)
.from(configurationValueRecord); .from(configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.255+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.446+01:00", comments="Source Table: configuration_value")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value)
.from(configurationValueRecord); .from(configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.255+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.446+01:00", comments="Source Table: configuration_value")
default ConfigurationValueRecord selectByPrimaryKey(Long id_) { default ConfigurationValueRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationId, configurationAttributeId, listIndex, value) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationId, configurationAttributeId, listIndex, value)
.from(configurationValueRecord) .from(configurationValueRecord)
@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.255+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.446+01:00", comments="Source Table: configuration_value")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(id).equalTo(record::getId) .set(id).equalTo(record::getId)
@ -150,7 +150,7 @@ public interface ConfigurationValueRecordMapper {
.set(value).equalTo(record::getValue); .set(value).equalTo(record::getValue);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.255+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.447+01:00", comments="Source Table: configuration_value")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(id).equalToWhenPresent(record::getId) .set(id).equalToWhenPresent(record::getId)
@ -161,7 +161,7 @@ public interface ConfigurationValueRecordMapper {
.set(value).equalToWhenPresent(record::getValue); .set(value).equalToWhenPresent(record::getValue);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.255+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.447+01:00", comments="Source Table: configuration_value")
default int updateByPrimaryKey(ConfigurationValueRecord record) { default int updateByPrimaryKey(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -174,7 +174,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.256+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.447+01:00", comments="Source Table: configuration_value")
default int updateByPrimaryKeySelective(ConfigurationValueRecord record) { default int updateByPrimaryKeySelective(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

16
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java
View file

@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ExamConfigurationMapRecordDynamicSqlSupport { public final class ExamConfigurationMapRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.301+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.514+01:00", comments="Source Table: exam_configuration_map")
public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.301+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.514+01:00", comments="Source field: exam_configuration_map.id")
public static final SqlColumn<Long> id = examConfigurationMapRecord.id; public static final SqlColumn<Long> id = examConfigurationMapRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.301+01:00", comments="Source field: exam_configuration_map.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.514+01:00", comments="Source field: exam_configuration_map.institution_id")
public static final SqlColumn<Long> institutionId = examConfigurationMapRecord.institutionId; public static final SqlColumn<Long> institutionId = examConfigurationMapRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.301+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.514+01:00", comments="Source field: exam_configuration_map.exam_id")
public static final SqlColumn<Long> examId = examConfigurationMapRecord.examId; public static final SqlColumn<Long> examId = examConfigurationMapRecord.examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.301+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.514+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
public static final SqlColumn<Long> configurationNodeId = examConfigurationMapRecord.configurationNodeId; public static final SqlColumn<Long> configurationNodeId = examConfigurationMapRecord.configurationNodeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.301+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.514+01:00", comments="Source field: exam_configuration_map.user_names")
public static final SqlColumn<String> userNames = examConfigurationMapRecord.userNames; public static final SqlColumn<String> userNames = examConfigurationMapRecord.userNames;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.301+01:00", comments="Source field: exam_configuration_map.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.515+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
public static final SqlColumn<String> encryptSecret = examConfigurationMapRecord.encryptSecret; public static final SqlColumn<String> encryptSecret = examConfigurationMapRecord.encryptSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.301+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.514+01:00", comments="Source Table: exam_configuration_map")
public static final class ExamConfigurationMapRecord extends SqlTable { public static final class ExamConfigurationMapRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ExamConfigurationMapRecordMapper { public interface ExamConfigurationMapRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.302+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.515+01:00", comments="Source Table: exam_configuration_map")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.302+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.515+01:00", comments="Source Table: exam_configuration_map")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.302+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.515+01:00", comments="Source Table: exam_configuration_map")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ExamConfigurationMapRecord> insertStatement); int insert(InsertStatementProvider<ExamConfigurationMapRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.302+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.515+01:00", comments="Source Table: exam_configuration_map")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -57,7 +57,7 @@ public interface ExamConfigurationMapRecordMapper {
}) })
ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement); ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.302+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.515+01:00", comments="Source Table: exam_configuration_map")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -69,22 +69,22 @@ public interface ExamConfigurationMapRecordMapper {
}) })
List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement); List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.302+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.515+01:00", comments="Source Table: exam_configuration_map")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.302+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.515+01:00", comments="Source Table: exam_configuration_map")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(examConfigurationMapRecord); .from(examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.302+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.516+01:00", comments="Source Table: exam_configuration_map")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord); return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.302+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.516+01:00", comments="Source Table: exam_configuration_map")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord) return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -92,7 +92,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.302+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.516+01:00", comments="Source Table: exam_configuration_map")
default int insert(ExamConfigurationMapRecord record) { default int insert(ExamConfigurationMapRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examConfigurationMapRecord) .into(examConfigurationMapRecord)
@ -105,7 +105,7 @@ public interface ExamConfigurationMapRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.303+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.516+01:00", comments="Source Table: exam_configuration_map")
default int insertSelective(ExamConfigurationMapRecord record) { default int insertSelective(ExamConfigurationMapRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examConfigurationMapRecord) .into(examConfigurationMapRecord)
@ -118,19 +118,19 @@ public interface ExamConfigurationMapRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.303+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.516+01:00", comments="Source Table: exam_configuration_map")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret)
.from(examConfigurationMapRecord); .from(examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.303+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.516+01:00", comments="Source Table: exam_configuration_map")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret)
.from(examConfigurationMapRecord); .from(examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.303+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.516+01:00", comments="Source Table: exam_configuration_map")
default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) { default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, userNames, encryptSecret)
.from(examConfigurationMapRecord) .from(examConfigurationMapRecord)
@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.303+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.516+01:00", comments="Source Table: exam_configuration_map")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -149,7 +149,7 @@ public interface ExamConfigurationMapRecordMapper {
.set(encryptSecret).equalTo(record::getEncryptSecret); .set(encryptSecret).equalTo(record::getEncryptSecret);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.303+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.516+01:00", comments="Source Table: exam_configuration_map")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -159,7 +159,7 @@ public interface ExamConfigurationMapRecordMapper {
.set(encryptSecret).equalToWhenPresent(record::getEncryptSecret); .set(encryptSecret).equalToWhenPresent(record::getEncryptSecret);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.303+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.517+01:00", comments="Source Table: exam_configuration_map")
default int updateByPrimaryKey(ExamConfigurationMapRecord record) { default int updateByPrimaryKey(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -172,7 +172,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.303+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.517+01:00", comments="Source Table: exam_configuration_map")
default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) { default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

35
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java
View file

@ -6,49 +6,52 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ExamRecordDynamicSqlSupport { public final class ExamRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source Table: exam")
public static final ExamRecord examRecord = new ExamRecord(); public static final ExamRecord examRecord = new ExamRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.309+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.520+01:00", comments="Source field: exam.id")
public static final SqlColumn<Long> id = examRecord.id; public static final SqlColumn<Long> id = examRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.309+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.520+01:00", comments="Source field: exam.institution_id")
public static final SqlColumn<Long> institutionId = examRecord.institutionId; public static final SqlColumn<Long> institutionId = examRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.309+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.520+01:00", comments="Source field: exam.lms_setup_id")
public static final SqlColumn<Long> lmsSetupId = examRecord.lmsSetupId; public static final SqlColumn<Long> lmsSetupId = examRecord.lmsSetupId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.309+01:00", comments="Source field: exam.external_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.520+01:00", comments="Source field: exam.external_id")
public static final SqlColumn<String> externalId = examRecord.externalId; public static final SqlColumn<String> externalId = examRecord.externalId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.309+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.520+01:00", comments="Source field: exam.owner")
public static final SqlColumn<String> owner = examRecord.owner; public static final SqlColumn<String> owner = examRecord.owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.310+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.520+01:00", comments="Source field: exam.supporter")
public static final SqlColumn<String> supporter = examRecord.supporter; public static final SqlColumn<String> supporter = examRecord.supporter;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.311+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.520+01:00", comments="Source field: exam.type")
public static final SqlColumn<String> type = examRecord.type; public static final SqlColumn<String> type = examRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.311+01:00", comments="Source field: exam.quit_password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.520+01:00", comments="Source field: exam.quit_password")
public static final SqlColumn<String> quitPassword = examRecord.quitPassword; public static final SqlColumn<String> quitPassword = examRecord.quitPassword;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.311+01:00", comments="Source field: exam.browser_keys") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.520+01:00", comments="Source field: exam.browser_keys")
public static final SqlColumn<String> browserKeys = examRecord.browserKeys; public static final SqlColumn<String> browserKeys = examRecord.browserKeys;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.312+01:00", comments="Source field: exam.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.520+01:00", comments="Source field: exam.status")
public static final SqlColumn<String> status = examRecord.status; public static final SqlColumn<String> status = examRecord.status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.312+01:00", comments="Source field: exam.updating") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source field: exam.lms_seb_restriction")
public static final SqlColumn<Integer> lmsSebRestriction = examRecord.lmsSebRestriction;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source field: exam.updating")
public static final SqlColumn<Integer> updating = examRecord.updating; public static final SqlColumn<Integer> updating = examRecord.updating;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.312+01:00", comments="Source field: exam.lastupdate") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source field: exam.lastupdate")
public static final SqlColumn<String> lastupdate = examRecord.lastupdate; public static final SqlColumn<String> lastupdate = examRecord.lastupdate;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.312+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source field: exam.active")
public static final SqlColumn<Integer> active = examRecord.active; public static final SqlColumn<Integer> active = examRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.309+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source Table: exam")
public static final class ExamRecord extends SqlTable { public static final class ExamRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
@ -70,6 +73,8 @@ public final class ExamRecordDynamicSqlSupport {
public final SqlColumn<String> status = column("status", JDBCType.VARCHAR); public final SqlColumn<String> status = column("status", JDBCType.VARCHAR);
public final SqlColumn<Integer> lmsSebRestriction = column("lms_seb_restriction", JDBCType.INTEGER);
public final SqlColumn<Integer> updating = column("updating", JDBCType.INTEGER); public final SqlColumn<Integer> updating = column("updating", JDBCType.INTEGER);
public final SqlColumn<String> lastupdate = column("lastupdate", JDBCType.VARCHAR); public final SqlColumn<String> lastupdate = column("lastupdate", JDBCType.VARCHAR);

50
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ExamRecordMapper { public interface ExamRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.312+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.312+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.312+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ExamRecord> insertStatement); int insert(InsertStatementProvider<ExamRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.312+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -58,13 +58,14 @@ public interface ExamRecordMapper {
@Arg(column="quit_password", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="quit_password", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="browser_keys", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="browser_keys", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="status", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="status", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="lms_seb_restriction", javaType=Integer.class, jdbcType=JdbcType.INTEGER),
@Arg(column="updating", javaType=Integer.class, jdbcType=JdbcType.INTEGER), @Arg(column="updating", javaType=Integer.class, jdbcType=JdbcType.INTEGER),
@Arg(column="lastupdate", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="lastupdate", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER) @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER)
}) })
ExamRecord selectOne(SelectStatementProvider selectStatement); ExamRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.313+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -77,28 +78,29 @@ public interface ExamRecordMapper {
@Arg(column="quit_password", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="quit_password", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="browser_keys", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="browser_keys", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="status", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="status", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="lms_seb_restriction", javaType=Integer.class, jdbcType=JdbcType.INTEGER),
@Arg(column="updating", javaType=Integer.class, jdbcType=JdbcType.INTEGER), @Arg(column="updating", javaType=Integer.class, jdbcType=JdbcType.INTEGER),
@Arg(column="lastupdate", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="lastupdate", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER) @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER)
}) })
List<ExamRecord> selectMany(SelectStatementProvider selectStatement); List<ExamRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.313+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.313+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(examRecord); .from(examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.313+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); return DeleteDSL.deleteFromWithMapper(this::delete, examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.313+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, examRecord) return DeleteDSL.deleteFromWithMapper(this::delete, examRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -106,7 +108,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.313+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
default int insert(ExamRecord record) { default int insert(ExamRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examRecord) .into(examRecord)
@ -119,6 +121,7 @@ public interface ExamRecordMapper {
.map(quitPassword).toProperty("quitPassword") .map(quitPassword).toProperty("quitPassword")
.map(browserKeys).toProperty("browserKeys") .map(browserKeys).toProperty("browserKeys")
.map(status).toProperty("status") .map(status).toProperty("status")
.map(lmsSebRestriction).toProperty("lmsSebRestriction")
.map(updating).toProperty("updating") .map(updating).toProperty("updating")
.map(lastupdate).toProperty("lastupdate") .map(lastupdate).toProperty("lastupdate")
.map(active).toProperty("active") .map(active).toProperty("active")
@ -126,7 +129,7 @@ public interface ExamRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.313+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
default int insertSelective(ExamRecord record) { default int insertSelective(ExamRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examRecord) .into(examRecord)
@ -139,6 +142,7 @@ public interface ExamRecordMapper {
.map(quitPassword).toPropertyWhenPresent("quitPassword", record::getQuitPassword) .map(quitPassword).toPropertyWhenPresent("quitPassword", record::getQuitPassword)
.map(browserKeys).toPropertyWhenPresent("browserKeys", record::getBrowserKeys) .map(browserKeys).toPropertyWhenPresent("browserKeys", record::getBrowserKeys)
.map(status).toPropertyWhenPresent("status", record::getStatus) .map(status).toPropertyWhenPresent("status", record::getStatus)
.map(lmsSebRestriction).toPropertyWhenPresent("lmsSebRestriction", record::getLmsSebRestriction)
.map(updating).toPropertyWhenPresent("updating", record::getUpdating) .map(updating).toPropertyWhenPresent("updating", record::getUpdating)
.map(lastupdate).toPropertyWhenPresent("lastupdate", record::getLastupdate) .map(lastupdate).toPropertyWhenPresent("lastupdate", record::getLastupdate)
.map(active).toPropertyWhenPresent("active", record::getActive) .map(active).toPropertyWhenPresent("active", record::getActive)
@ -146,28 +150,28 @@ public interface ExamRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.313+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, updating, lastupdate, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active)
.from(examRecord); .from(examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.313+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, updating, lastupdate, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active)
.from(examRecord); .from(examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.314+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.521+01:00", comments="Source Table: exam")
default ExamRecord selectByPrimaryKey(Long id_) { default ExamRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, updating, lastupdate, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active)
.from(examRecord) .from(examRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
.build() .build()
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.314+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.522+01:00", comments="Source Table: exam")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamRecord record) {
return UpdateDSL.updateWithMapper(this::update, examRecord) return UpdateDSL.updateWithMapper(this::update, examRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -179,12 +183,13 @@ public interface ExamRecordMapper {
.set(quitPassword).equalTo(record::getQuitPassword) .set(quitPassword).equalTo(record::getQuitPassword)
.set(browserKeys).equalTo(record::getBrowserKeys) .set(browserKeys).equalTo(record::getBrowserKeys)
.set(status).equalTo(record::getStatus) .set(status).equalTo(record::getStatus)
.set(lmsSebRestriction).equalTo(record::getLmsSebRestriction)
.set(updating).equalTo(record::getUpdating) .set(updating).equalTo(record::getUpdating)
.set(lastupdate).equalTo(record::getLastupdate) .set(lastupdate).equalTo(record::getLastupdate)
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.314+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.522+01:00", comments="Source Table: exam")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamRecord record) {
return UpdateDSL.updateWithMapper(this::update, examRecord) return UpdateDSL.updateWithMapper(this::update, examRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -196,12 +201,13 @@ public interface ExamRecordMapper {
.set(quitPassword).equalToWhenPresent(record::getQuitPassword) .set(quitPassword).equalToWhenPresent(record::getQuitPassword)
.set(browserKeys).equalToWhenPresent(record::getBrowserKeys) .set(browserKeys).equalToWhenPresent(record::getBrowserKeys)
.set(status).equalToWhenPresent(record::getStatus) .set(status).equalToWhenPresent(record::getStatus)
.set(lmsSebRestriction).equalToWhenPresent(record::getLmsSebRestriction)
.set(updating).equalToWhenPresent(record::getUpdating) .set(updating).equalToWhenPresent(record::getUpdating)
.set(lastupdate).equalToWhenPresent(record::getLastupdate) .set(lastupdate).equalToWhenPresent(record::getLastupdate)
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.314+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.522+01:00", comments="Source Table: exam")
default int updateByPrimaryKey(ExamRecord record) { default int updateByPrimaryKey(ExamRecord record) {
return UpdateDSL.updateWithMapper(this::update, examRecord) return UpdateDSL.updateWithMapper(this::update, examRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -213,6 +219,7 @@ public interface ExamRecordMapper {
.set(quitPassword).equalTo(record::getQuitPassword) .set(quitPassword).equalTo(record::getQuitPassword)
.set(browserKeys).equalTo(record::getBrowserKeys) .set(browserKeys).equalTo(record::getBrowserKeys)
.set(status).equalTo(record::getStatus) .set(status).equalTo(record::getStatus)
.set(lmsSebRestriction).equalTo(record::getLmsSebRestriction)
.set(updating).equalTo(record::getUpdating) .set(updating).equalTo(record::getUpdating)
.set(lastupdate).equalTo(record::getLastupdate) .set(lastupdate).equalTo(record::getLastupdate)
.set(active).equalTo(record::getActive) .set(active).equalTo(record::getActive)
@ -221,7 +228,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.314+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.522+01:00", comments="Source Table: exam")
default int updateByPrimaryKeySelective(ExamRecord record) { default int updateByPrimaryKeySelective(ExamRecord record) {
return UpdateDSL.updateWithMapper(this::update, examRecord) return UpdateDSL.updateWithMapper(this::update, examRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -233,6 +240,7 @@ public interface ExamRecordMapper {
.set(quitPassword).equalToWhenPresent(record::getQuitPassword) .set(quitPassword).equalToWhenPresent(record::getQuitPassword)
.set(browserKeys).equalToWhenPresent(record::getBrowserKeys) .set(browserKeys).equalToWhenPresent(record::getBrowserKeys)
.set(status).equalToWhenPresent(record::getStatus) .set(status).equalToWhenPresent(record::getStatus)
.set(lmsSebRestriction).equalToWhenPresent(record::getLmsSebRestriction)
.set(updating).equalToWhenPresent(record::getUpdating) .set(updating).equalToWhenPresent(record::getUpdating)
.set(lastupdate).equalToWhenPresent(record::getLastupdate) .set(lastupdate).equalToWhenPresent(record::getLastupdate)
.set(active).equalToWhenPresent(record::getActive) .set(active).equalToWhenPresent(record::getActive)

14
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java
View file

@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class IndicatorRecordDynamicSqlSupport { public final class IndicatorRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.532+01:00", comments="Source Table: indicator")
public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); public static final IndicatorRecord indicatorRecord = new IndicatorRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.532+01:00", comments="Source field: indicator.id")
public static final SqlColumn<Long> id = indicatorRecord.id; public static final SqlColumn<Long> id = indicatorRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.532+01:00", comments="Source field: indicator.exam_id")
public static final SqlColumn<Long> examId = indicatorRecord.examId; public static final SqlColumn<Long> examId = indicatorRecord.examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.532+01:00", comments="Source field: indicator.type")
public static final SqlColumn<String> type = indicatorRecord.type; public static final SqlColumn<String> type = indicatorRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.532+01:00", comments="Source field: indicator.name")
public static final SqlColumn<String> name = indicatorRecord.name; public static final SqlColumn<String> name = indicatorRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.532+01:00", comments="Source field: indicator.color")
public static final SqlColumn<String> color = indicatorRecord.color; public static final SqlColumn<String> color = indicatorRecord.color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.532+01:00", comments="Source Table: indicator")
public static final class IndicatorRecord extends SqlTable { public static final class IndicatorRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface IndicatorRecordMapper { public interface IndicatorRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.532+01:00", comments="Source Table: indicator")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.532+01:00", comments="Source Table: indicator")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.532+01:00", comments="Source Table: indicator")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<IndicatorRecord> insertStatement); int insert(InsertStatementProvider<IndicatorRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -56,7 +56,7 @@ public interface IndicatorRecordMapper {
}) })
IndicatorRecord selectOne(SelectStatementProvider selectStatement); IndicatorRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -67,22 +67,22 @@ public interface IndicatorRecordMapper {
}) })
List<IndicatorRecord> selectMany(SelectStatementProvider selectStatement); List<IndicatorRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(indicatorRecord); .from(indicatorRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord); return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord) return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -90,7 +90,7 @@ public interface IndicatorRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default int insert(IndicatorRecord record) { default int insert(IndicatorRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(indicatorRecord) .into(indicatorRecord)
@ -102,7 +102,7 @@ public interface IndicatorRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default int insertSelective(IndicatorRecord record) { default int insertSelective(IndicatorRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(indicatorRecord) .into(indicatorRecord)
@ -114,19 +114,19 @@ public interface IndicatorRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<IndicatorRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<IndicatorRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, examId, type, name, color) return SelectDSL.selectWithMapper(this::selectMany, id, examId, type, name, color)
.from(indicatorRecord); .from(indicatorRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.324+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<IndicatorRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<IndicatorRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, type, name, color) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, type, name, color)
.from(indicatorRecord); .from(indicatorRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.325+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default IndicatorRecord selectByPrimaryKey(Long id_) { default IndicatorRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, examId, type, name, color) return SelectDSL.selectWithMapper(this::selectOne, id, examId, type, name, color)
.from(indicatorRecord) .from(indicatorRecord)
@ -135,7 +135,7 @@ public interface IndicatorRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.325+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(IndicatorRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(IndicatorRecord record) {
return UpdateDSL.updateWithMapper(this::update, indicatorRecord) return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -144,7 +144,7 @@ public interface IndicatorRecordMapper {
.set(color).equalTo(record::getColor); .set(color).equalTo(record::getColor);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.325+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(IndicatorRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(IndicatorRecord record) {
return UpdateDSL.updateWithMapper(this::update, indicatorRecord) return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)
@ -153,7 +153,7 @@ public interface IndicatorRecordMapper {
.set(color).equalToWhenPresent(record::getColor); .set(color).equalToWhenPresent(record::getColor);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.325+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default int updateByPrimaryKey(IndicatorRecord record) { default int updateByPrimaryKey(IndicatorRecord record) {
return UpdateDSL.updateWithMapper(this::update, indicatorRecord) return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -165,7 +165,7 @@ public interface IndicatorRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.325+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.533+01:00", comments="Source Table: indicator")
default int updateByPrimaryKeySelective(IndicatorRecord record) { default int updateByPrimaryKeySelective(IndicatorRecord record) {
return UpdateDSL.updateWithMapper(this::update, indicatorRecord) return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)

16
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java
View file

@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class InstitutionRecordDynamicSqlSupport { public final class InstitutionRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.538+01:00", comments="Source Table: institution")
public static final InstitutionRecord institutionRecord = new InstitutionRecord(); public static final InstitutionRecord institutionRecord = new InstitutionRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.538+01:00", comments="Source field: institution.id")
public static final SqlColumn<Long> id = institutionRecord.id; public static final SqlColumn<Long> id = institutionRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.538+01:00", comments="Source field: institution.name")
public static final SqlColumn<String> name = institutionRecord.name; public static final SqlColumn<String> name = institutionRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.538+01:00", comments="Source field: institution.url_suffix")
public static final SqlColumn<String> urlSuffix = institutionRecord.urlSuffix; public static final SqlColumn<String> urlSuffix = institutionRecord.urlSuffix;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source field: institution.theme_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.538+01:00", comments="Source field: institution.theme_name")
public static final SqlColumn<String> themeName = institutionRecord.themeName; public static final SqlColumn<String> themeName = institutionRecord.themeName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.538+01:00", comments="Source field: institution.active")
public static final SqlColumn<Integer> active = institutionRecord.active; public static final SqlColumn<Integer> active = institutionRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source field: institution.logo_image")
public static final SqlColumn<String> logoImage = institutionRecord.logoImage; public static final SqlColumn<String> logoImage = institutionRecord.logoImage;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.538+01:00", comments="Source Table: institution")
public static final class InstitutionRecord extends SqlTable { public static final class InstitutionRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface InstitutionRecordMapper { public interface InstitutionRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.333+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<InstitutionRecord> insertStatement); int insert(InsertStatementProvider<InstitutionRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -57,7 +57,7 @@ public interface InstitutionRecordMapper {
}) })
InstitutionRecord selectOne(SelectStatementProvider selectStatement); InstitutionRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -69,22 +69,22 @@ public interface InstitutionRecordMapper {
}) })
List<InstitutionRecord> selectMany(SelectStatementProvider selectStatement); List<InstitutionRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(institutionRecord); .from(institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -92,7 +92,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
default int insert(InstitutionRecord record) { default int insert(InstitutionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(institutionRecord) .into(institutionRecord)
@ -105,7 +105,7 @@ public interface InstitutionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
default int insertSelective(InstitutionRecord record) { default int insertSelective(InstitutionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(institutionRecord) .into(institutionRecord)
@ -118,19 +118,19 @@ public interface InstitutionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.539+01:00", comments="Source Table: institution")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage)
.from(institutionRecord); .from(institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.540+01:00", comments="Source Table: institution")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage)
.from(institutionRecord); .from(institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.540+01:00", comments="Source Table: institution")
default InstitutionRecord selectByPrimaryKey(Long id_) { default InstitutionRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage) return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage)
.from(institutionRecord) .from(institutionRecord)
@ -139,7 +139,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.540+01:00", comments="Source Table: institution")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(InstitutionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -149,7 +149,7 @@ public interface InstitutionRecordMapper {
.set(logoImage).equalTo(record::getLogoImage); .set(logoImage).equalTo(record::getLogoImage);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.334+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.540+01:00", comments="Source Table: institution")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(InstitutionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)
@ -159,7 +159,7 @@ public interface InstitutionRecordMapper {
.set(logoImage).equalToWhenPresent(record::getLogoImage); .set(logoImage).equalToWhenPresent(record::getLogoImage);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.540+01:00", comments="Source Table: institution")
default int updateByPrimaryKey(InstitutionRecord record) { default int updateByPrimaryKey(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -172,7 +172,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.540+01:00", comments="Source Table: institution")
default int updateByPrimaryKeySelective(InstitutionRecord record) { default int updateByPrimaryKeySelective(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)

28
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java
View file

@ -6,46 +6,46 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class LmsSetupRecordDynamicSqlSupport { public final class LmsSetupRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.340+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source Table: lms_setup")
public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord(); public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.340+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.id")
public static final SqlColumn<Long> id = lmsSetupRecord.id; public static final SqlColumn<Long> id = lmsSetupRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.340+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.institution_id")
public static final SqlColumn<Long> institutionId = lmsSetupRecord.institutionId; public static final SqlColumn<Long> institutionId = lmsSetupRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.340+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.name")
public static final SqlColumn<String> name = lmsSetupRecord.name; public static final SqlColumn<String> name = lmsSetupRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.340+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_type")
public static final SqlColumn<String> lmsType = lmsSetupRecord.lmsType; public static final SqlColumn<String> lmsType = lmsSetupRecord.lmsType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.340+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source field: lms_setup.lms_url")
public static final SqlColumn<String> lmsUrl = lmsSetupRecord.lmsUrl; public static final SqlColumn<String> lmsUrl = lmsSetupRecord.lmsUrl;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.340+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source field: lms_setup.lms_clientname")
public static final SqlColumn<String> lmsClientname = lmsSetupRecord.lmsClientname; public static final SqlColumn<String> lmsClientname = lmsSetupRecord.lmsClientname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.340+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source field: lms_setup.lms_clientsecret")
public static final SqlColumn<String> lmsClientsecret = lmsSetupRecord.lmsClientsecret; public static final SqlColumn<String> lmsClientsecret = lmsSetupRecord.lmsClientsecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source field: lms_setup.lms_rest_api_token")
public static final SqlColumn<String> lmsRestApiToken = lmsSetupRecord.lmsRestApiToken; public static final SqlColumn<String> lmsRestApiToken = lmsSetupRecord.lmsRestApiToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source field: lms_setup.lms_proxy_auth_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source field: lms_setup.lms_proxy_auth_type")
public static final SqlColumn<String> lmsProxyAuthType = lmsSetupRecord.lmsProxyAuthType; public static final SqlColumn<String> lmsProxyAuthType = lmsSetupRecord.lmsProxyAuthType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source field: lms_setup.lms_proxy_auth_username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
public static final SqlColumn<String> lmsProxyAuthUsername = lmsSetupRecord.lmsProxyAuthUsername; public static final SqlColumn<String> lmsProxyAuthUsername = lmsSetupRecord.lmsProxyAuthUsername;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
public static final SqlColumn<String> lmsProxyAuthSecret = lmsSetupRecord.lmsProxyAuthSecret; public static final SqlColumn<String> lmsProxyAuthSecret = lmsSetupRecord.lmsProxyAuthSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source field: lms_setup.active")
public static final SqlColumn<Integer> active = lmsSetupRecord.active; public static final SqlColumn<Integer> active = lmsSetupRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.340+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source Table: lms_setup")
public static final class LmsSetupRecord extends SqlTable { public static final class LmsSetupRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface LmsSetupRecordMapper { public interface LmsSetupRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source Table: lms_setup")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source Table: lms_setup")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source Table: lms_setup")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<LmsSetupRecord> insertStatement); int insert(InsertStatementProvider<LmsSetupRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source Table: lms_setup")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -63,7 +63,7 @@ public interface LmsSetupRecordMapper {
}) })
LmsSetupRecord selectOne(SelectStatementProvider selectStatement); LmsSetupRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source Table: lms_setup")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -81,22 +81,22 @@ public interface LmsSetupRecordMapper {
}) })
List<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement); List<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source Table: lms_setup")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source Table: lms_setup")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(lmsSetupRecord); .from(lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source Table: lms_setup")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord); return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.341+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.546+01:00", comments="Source Table: lms_setup")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord) return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -104,7 +104,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.342+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.547+01:00", comments="Source Table: lms_setup")
default int insert(LmsSetupRecord record) { default int insert(LmsSetupRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(lmsSetupRecord) .into(lmsSetupRecord)
@ -123,7 +123,7 @@ public interface LmsSetupRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.342+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.547+01:00", comments="Source Table: lms_setup")
default int insertSelective(LmsSetupRecord record) { default int insertSelective(LmsSetupRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(lmsSetupRecord) .into(lmsSetupRecord)
@ -142,19 +142,19 @@ public interface LmsSetupRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.342+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.547+01:00", comments="Source Table: lms_setup")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyAuthType, lmsProxyAuthUsername, lmsProxyAuthSecret, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyAuthType, lmsProxyAuthUsername, lmsProxyAuthSecret, active)
.from(lmsSetupRecord); .from(lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.342+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.547+01:00", comments="Source Table: lms_setup")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyAuthType, lmsProxyAuthUsername, lmsProxyAuthSecret, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyAuthType, lmsProxyAuthUsername, lmsProxyAuthSecret, active)
.from(lmsSetupRecord); .from(lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.342+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.547+01:00", comments="Source Table: lms_setup")
default LmsSetupRecord selectByPrimaryKey(Long id_) { default LmsSetupRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyAuthType, lmsProxyAuthUsername, lmsProxyAuthSecret, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyAuthType, lmsProxyAuthUsername, lmsProxyAuthSecret, active)
.from(lmsSetupRecord) .from(lmsSetupRecord)
@ -163,7 +163,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.342+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.547+01:00", comments="Source Table: lms_setup")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(LmsSetupRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -179,7 +179,7 @@ public interface LmsSetupRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.342+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.547+01:00", comments="Source Table: lms_setup")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(LmsSetupRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -195,7 +195,7 @@ public interface LmsSetupRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.342+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.547+01:00", comments="Source Table: lms_setup")
default int updateByPrimaryKey(LmsSetupRecord record) { default int updateByPrimaryKey(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -214,7 +214,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.342+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.547+01:00", comments="Source Table: lms_setup")
default int updateByPrimaryKeySelective(LmsSetupRecord record) { default int updateByPrimaryKeySelective(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

24
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java
View file

@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class OrientationRecordDynamicSqlSupport { public final class OrientationRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.268+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.457+01:00", comments="Source Table: orientation")
public static final OrientationRecord orientationRecord = new OrientationRecord(); public static final OrientationRecord orientationRecord = new OrientationRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.269+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.458+01:00", comments="Source field: orientation.id")
public static final SqlColumn<Long> id = orientationRecord.id; public static final SqlColumn<Long> id = orientationRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.269+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.458+01:00", comments="Source field: orientation.config_attribute_id")
public static final SqlColumn<Long> configAttributeId = orientationRecord.configAttributeId; public static final SqlColumn<Long> configAttributeId = orientationRecord.configAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.270+01:00", comments="Source field: orientation.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.459+01:00", comments="Source field: orientation.template_id")
public static final SqlColumn<Long> templateId = orientationRecord.templateId; public static final SqlColumn<Long> templateId = orientationRecord.templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.271+01:00", comments="Source field: orientation.view_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.459+01:00", comments="Source field: orientation.view_id")
public static final SqlColumn<Long> viewId = orientationRecord.viewId; public static final SqlColumn<Long> viewId = orientationRecord.viewId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.271+01:00", comments="Source field: orientation.group_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.460+01:00", comments="Source field: orientation.group_id")
public static final SqlColumn<String> groupId = orientationRecord.groupId; public static final SqlColumn<String> groupId = orientationRecord.groupId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.271+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.460+01:00", comments="Source field: orientation.x_position")
public static final SqlColumn<Integer> xPosition = orientationRecord.xPosition; public static final SqlColumn<Integer> xPosition = orientationRecord.xPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.272+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.462+01:00", comments="Source field: orientation.y_position")
public static final SqlColumn<Integer> yPosition = orientationRecord.yPosition; public static final SqlColumn<Integer> yPosition = orientationRecord.yPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.272+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.463+01:00", comments="Source field: orientation.width")
public static final SqlColumn<Integer> width = orientationRecord.width; public static final SqlColumn<Integer> width = orientationRecord.width;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.272+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.463+01:00", comments="Source field: orientation.height")
public static final SqlColumn<Integer> height = orientationRecord.height; public static final SqlColumn<Integer> height = orientationRecord.height;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.274+01:00", comments="Source field: orientation.title") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.464+01:00", comments="Source field: orientation.title")
public static final SqlColumn<String> title = orientationRecord.title; public static final SqlColumn<String> title = orientationRecord.title;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.268+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.458+01:00", comments="Source Table: orientation")
public static final class OrientationRecord extends SqlTable { public static final class OrientationRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface OrientationRecordMapper { public interface OrientationRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.274+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.464+01:00", comments="Source Table: orientation")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.274+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.464+01:00", comments="Source Table: orientation")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.274+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.464+01:00", comments="Source Table: orientation")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<OrientationRecord> insertStatement); int insert(InsertStatementProvider<OrientationRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.274+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.465+01:00", comments="Source Table: orientation")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -61,7 +61,7 @@ public interface OrientationRecordMapper {
}) })
OrientationRecord selectOne(SelectStatementProvider selectStatement); OrientationRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.274+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.465+01:00", comments="Source Table: orientation")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -77,22 +77,22 @@ public interface OrientationRecordMapper {
}) })
List<OrientationRecord> selectMany(SelectStatementProvider selectStatement); List<OrientationRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.275+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.465+01:00", comments="Source Table: orientation")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.275+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.465+01:00", comments="Source Table: orientation")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(orientationRecord); .from(orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.275+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.465+01:00", comments="Source Table: orientation")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.275+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.465+01:00", comments="Source Table: orientation")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord) return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -100,7 +100,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.275+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.466+01:00", comments="Source Table: orientation")
default int insert(OrientationRecord record) { default int insert(OrientationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(orientationRecord) .into(orientationRecord)
@ -117,7 +117,7 @@ public interface OrientationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.276+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.466+01:00", comments="Source Table: orientation")
default int insertSelective(OrientationRecord record) { default int insertSelective(OrientationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(orientationRecord) .into(orientationRecord)
@ -134,19 +134,19 @@ public interface OrientationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.277+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.467+01:00", comments="Source Table: orientation")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title)
.from(orientationRecord); .from(orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.278+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.467+01:00", comments="Source Table: orientation")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title)
.from(orientationRecord); .from(orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.278+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.467+01:00", comments="Source Table: orientation")
default OrientationRecord selectByPrimaryKey(Long id_) { default OrientationRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title)
.from(orientationRecord) .from(orientationRecord)
@ -155,7 +155,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.278+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.467+01:00", comments="Source Table: orientation")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalTo(record::getConfigAttributeId) .set(configAttributeId).equalTo(record::getConfigAttributeId)
@ -169,7 +169,7 @@ public interface OrientationRecordMapper {
.set(title).equalTo(record::getTitle); .set(title).equalTo(record::getTitle);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.278+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.467+01:00", comments="Source Table: orientation")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)
@ -183,7 +183,7 @@ public interface OrientationRecordMapper {
.set(title).equalToWhenPresent(record::getTitle); .set(title).equalToWhenPresent(record::getTitle);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.278+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.467+01:00", comments="Source Table: orientation")
default int updateByPrimaryKey(OrientationRecord record) { default int updateByPrimaryKey(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalTo(record::getConfigAttributeId) .set(configAttributeId).equalTo(record::getConfigAttributeId)
@ -200,7 +200,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.278+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.468+01:00", comments="Source Table: orientation")
default int updateByPrimaryKeySelective(OrientationRecord record) { default int updateByPrimaryKeySelective(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)

10
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java
View file

@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class RoleRecordDynamicSqlSupport { public final class RoleRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
public static final RoleRecord roleRecord = new RoleRecord(); public static final RoleRecord roleRecord = new RoleRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source field: user_role.id")
public static final SqlColumn<Long> id = roleRecord.id; public static final SqlColumn<Long> id = roleRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source field: user_role.user_id")
public static final SqlColumn<Long> userId = roleRecord.userId; public static final SqlColumn<Long> userId = roleRecord.userId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source field: user_role.role_name")
public static final SqlColumn<String> roleName = roleRecord.roleName; public static final SqlColumn<String> roleName = roleRecord.roleName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
public static final class RoleRecord extends SqlTable { public static final class RoleRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface RoleRecordMapper { public interface RoleRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<RoleRecord> insertStatement); int insert(InsertStatementProvider<RoleRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -54,7 +54,7 @@ public interface RoleRecordMapper {
}) })
RoleRecord selectOne(SelectStatementProvider selectStatement); RoleRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -63,22 +63,22 @@ public interface RoleRecordMapper {
}) })
List<RoleRecord> selectMany(SelectStatementProvider selectStatement); List<RoleRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(roleRecord); .from(roleRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord); return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord) return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -86,7 +86,7 @@ public interface RoleRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default int insert(RoleRecord record) { default int insert(RoleRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(roleRecord) .into(roleRecord)
@ -96,7 +96,7 @@ public interface RoleRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default int insertSelective(RoleRecord record) { default int insertSelective(RoleRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(roleRecord) .into(roleRecord)
@ -106,19 +106,19 @@ public interface RoleRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<RoleRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<RoleRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, userId, roleName) return SelectDSL.selectWithMapper(this::selectMany, id, userId, roleName)
.from(roleRecord); .from(roleRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<RoleRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<RoleRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userId, roleName) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userId, roleName)
.from(roleRecord); .from(roleRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default RoleRecord selectByPrimaryKey(Long id_) { default RoleRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, userId, roleName) return SelectDSL.selectWithMapper(this::selectOne, id, userId, roleName)
.from(roleRecord) .from(roleRecord)
@ -127,21 +127,21 @@ public interface RoleRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(RoleRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(RoleRecord record) {
return UpdateDSL.updateWithMapper(this::update, roleRecord) return UpdateDSL.updateWithMapper(this::update, roleRecord)
.set(userId).equalTo(record::getUserId) .set(userId).equalTo(record::getUserId)
.set(roleName).equalTo(record::getRoleName); .set(roleName).equalTo(record::getRoleName);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(RoleRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(RoleRecord record) {
return UpdateDSL.updateWithMapper(this::update, roleRecord) return UpdateDSL.updateWithMapper(this::update, roleRecord)
.set(userId).equalToWhenPresent(record::getUserId) .set(userId).equalToWhenPresent(record::getUserId)
.set(roleName).equalToWhenPresent(record::getRoleName); .set(roleName).equalToWhenPresent(record::getRoleName);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source Table: user_role")
default int updateByPrimaryKey(RoleRecord record) { default int updateByPrimaryKey(RoleRecord record) {
return UpdateDSL.updateWithMapper(this::update, roleRecord) return UpdateDSL.updateWithMapper(this::update, roleRecord)
.set(userId).equalTo(record::getUserId) .set(userId).equalTo(record::getUserId)
@ -151,7 +151,7 @@ public interface RoleRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.350+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source Table: user_role")
default int updateByPrimaryKeySelective(RoleRecord record) { default int updateByPrimaryKeySelective(RoleRecord record) {
return UpdateDSL.updateWithMapper(this::update, roleRecord) return UpdateDSL.updateWithMapper(this::update, roleRecord)
.set(userId).equalToWhenPresent(record::getUserId) .set(userId).equalToWhenPresent(record::getUserId)

20
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java
View file

@ -7,34 +7,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class SebClientConfigRecordDynamicSqlSupport { public final class SebClientConfigRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source Table: seb_client_configuration")
public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord(); public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.id")
public static final SqlColumn<Long> id = sebClientConfigRecord.id; public static final SqlColumn<Long> id = sebClientConfigRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.institution_id")
public static final SqlColumn<Long> institutionId = sebClientConfigRecord.institutionId; public static final SqlColumn<Long> institutionId = sebClientConfigRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source field: seb_client_configuration.name")
public static final SqlColumn<String> name = sebClientConfigRecord.name; public static final SqlColumn<String> name = sebClientConfigRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source field: seb_client_configuration.date")
public static final SqlColumn<DateTime> date = sebClientConfigRecord.date; public static final SqlColumn<DateTime> date = sebClientConfigRecord.date;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.client_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source field: seb_client_configuration.client_name")
public static final SqlColumn<String> clientName = sebClientConfigRecord.clientName; public static final SqlColumn<String> clientName = sebClientConfigRecord.clientName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source field: seb_client_configuration.client_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source field: seb_client_configuration.client_secret")
public static final SqlColumn<String> clientSecret = sebClientConfigRecord.clientSecret; public static final SqlColumn<String> clientSecret = sebClientConfigRecord.clientSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source field: seb_client_configuration.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
public static final SqlColumn<String> encryptSecret = sebClientConfigRecord.encryptSecret; public static final SqlColumn<String> encryptSecret = sebClientConfigRecord.encryptSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source field: seb_client_configuration.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source field: seb_client_configuration.active")
public static final SqlColumn<Integer> active = sebClientConfigRecord.active; public static final SqlColumn<Integer> active = sebClientConfigRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source Table: seb_client_configuration")
public static final class SebClientConfigRecord extends SqlTable { public static final class SebClientConfigRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java
View file

@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface SebClientConfigRecordMapper { public interface SebClientConfigRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source Table: seb_client_configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source Table: seb_client_configuration")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source Table: seb_client_configuration")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<SebClientConfigRecord> insertStatement); int insert(InsertStatementProvider<SebClientConfigRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source Table: seb_client_configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -61,7 +61,7 @@ public interface SebClientConfigRecordMapper {
}) })
SebClientConfigRecord selectOne(SelectStatementProvider selectStatement); SebClientConfigRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source Table: seb_client_configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -75,22 +75,22 @@ public interface SebClientConfigRecordMapper {
}) })
List<SebClientConfigRecord> selectMany(SelectStatementProvider selectStatement); List<SebClientConfigRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source Table: seb_client_configuration")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.542+01:00", comments="Source Table: seb_client_configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(sebClientConfigRecord); .from(sebClientConfigRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord); return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord) return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -98,7 +98,7 @@ public interface SebClientConfigRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default int insert(SebClientConfigRecord record) { default int insert(SebClientConfigRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(sebClientConfigRecord) .into(sebClientConfigRecord)
@ -113,7 +113,7 @@ public interface SebClientConfigRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default int insertSelective(SebClientConfigRecord record) { default int insertSelective(SebClientConfigRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(sebClientConfigRecord) .into(sebClientConfigRecord)
@ -128,19 +128,19 @@ public interface SebClientConfigRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SebClientConfigRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SebClientConfigRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active)
.from(sebClientConfigRecord); .from(sebClientConfigRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SebClientConfigRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SebClientConfigRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active)
.from(sebClientConfigRecord); .from(sebClientConfigRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default SebClientConfigRecord selectByPrimaryKey(Long id_) { default SebClientConfigRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active)
.from(sebClientConfigRecord) .from(sebClientConfigRecord)
@ -149,7 +149,7 @@ public interface SebClientConfigRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(SebClientConfigRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(SebClientConfigRecord record) {
return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -161,7 +161,7 @@ public interface SebClientConfigRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.337+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(SebClientConfigRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(SebClientConfigRecord record) {
return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -173,7 +173,7 @@ public interface SebClientConfigRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.338+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default int updateByPrimaryKey(SebClientConfigRecord record) { default int updateByPrimaryKey(SebClientConfigRecord record) {
return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -188,7 +188,7 @@ public interface SebClientConfigRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.338+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.543+01:00", comments="Source Table: seb_client_configuration")
default int updateByPrimaryKeySelective(SebClientConfigRecord record) { default int updateByPrimaryKeySelective(SebClientConfigRecord record) {
return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

12
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java
View file

@ -7,22 +7,22 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ThresholdRecordDynamicSqlSupport { public final class ThresholdRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.329+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.535+01:00", comments="Source Table: threshold")
public static final ThresholdRecord thresholdRecord = new ThresholdRecord(); public static final ThresholdRecord thresholdRecord = new ThresholdRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.329+01:00", comments="Source field: threshold.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.535+01:00", comments="Source field: threshold.id")
public static final SqlColumn<Long> id = thresholdRecord.id; public static final SqlColumn<Long> id = thresholdRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.329+01:00", comments="Source field: threshold.indicator_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.535+01:00", comments="Source field: threshold.indicator_id")
public static final SqlColumn<Long> indicatorId = thresholdRecord.indicatorId; public static final SqlColumn<Long> indicatorId = thresholdRecord.indicatorId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.330+01:00", comments="Source field: threshold.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.535+01:00", comments="Source field: threshold.value")
public static final SqlColumn<BigDecimal> value = thresholdRecord.value; public static final SqlColumn<BigDecimal> value = thresholdRecord.value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.330+01:00", comments="Source field: threshold.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.535+01:00", comments="Source field: threshold.color")
public static final SqlColumn<String> color = thresholdRecord.color; public static final SqlColumn<String> color = thresholdRecord.color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.329+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.535+01:00", comments="Source Table: threshold")
public static final class ThresholdRecord extends SqlTable { public static final class ThresholdRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java
View file

@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ThresholdRecordMapper { public interface ThresholdRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.330+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.535+01:00", comments="Source Table: threshold")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.330+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.535+01:00", comments="Source Table: threshold")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.330+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.535+01:00", comments="Source Table: threshold")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ThresholdRecord> insertStatement); int insert(InsertStatementProvider<ThresholdRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.330+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.535+01:00", comments="Source Table: threshold")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -56,7 +56,7 @@ public interface ThresholdRecordMapper {
}) })
ThresholdRecord selectOne(SelectStatementProvider selectStatement); ThresholdRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.330+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -66,22 +66,22 @@ public interface ThresholdRecordMapper {
}) })
List<ThresholdRecord> selectMany(SelectStatementProvider selectStatement); List<ThresholdRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.330+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.330+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(thresholdRecord); .from(thresholdRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord); return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord) return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -89,7 +89,7 @@ public interface ThresholdRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default int insert(ThresholdRecord record) { default int insert(ThresholdRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(thresholdRecord) .into(thresholdRecord)
@ -100,7 +100,7 @@ public interface ThresholdRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default int insertSelective(ThresholdRecord record) { default int insertSelective(ThresholdRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(thresholdRecord) .into(thresholdRecord)
@ -111,19 +111,19 @@ public interface ThresholdRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ThresholdRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ThresholdRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, indicatorId, value, color) return SelectDSL.selectWithMapper(this::selectMany, id, indicatorId, value, color)
.from(thresholdRecord); .from(thresholdRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ThresholdRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ThresholdRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, indicatorId, value, color) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, indicatorId, value, color)
.from(thresholdRecord); .from(thresholdRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default ThresholdRecord selectByPrimaryKey(Long id_) { default ThresholdRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, indicatorId, value, color) return SelectDSL.selectWithMapper(this::selectOne, id, indicatorId, value, color)
.from(thresholdRecord) .from(thresholdRecord)
@ -132,7 +132,7 @@ public interface ThresholdRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ThresholdRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ThresholdRecord record) {
return UpdateDSL.updateWithMapper(this::update, thresholdRecord) return UpdateDSL.updateWithMapper(this::update, thresholdRecord)
.set(indicatorId).equalTo(record::getIndicatorId) .set(indicatorId).equalTo(record::getIndicatorId)
@ -140,7 +140,7 @@ public interface ThresholdRecordMapper {
.set(color).equalTo(record::getColor); .set(color).equalTo(record::getColor);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ThresholdRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ThresholdRecord record) {
return UpdateDSL.updateWithMapper(this::update, thresholdRecord) return UpdateDSL.updateWithMapper(this::update, thresholdRecord)
.set(indicatorId).equalToWhenPresent(record::getIndicatorId) .set(indicatorId).equalToWhenPresent(record::getIndicatorId)
@ -148,7 +148,7 @@ public interface ThresholdRecordMapper {
.set(color).equalToWhenPresent(record::getColor); .set(color).equalToWhenPresent(record::getColor);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default int updateByPrimaryKey(ThresholdRecord record) { default int updateByPrimaryKey(ThresholdRecord record) {
return UpdateDSL.updateWithMapper(this::update, thresholdRecord) return UpdateDSL.updateWithMapper(this::update, thresholdRecord)
.set(indicatorId).equalTo(record::getIndicatorId) .set(indicatorId).equalTo(record::getIndicatorId)
@ -159,7 +159,7 @@ public interface ThresholdRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.331+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.536+01:00", comments="Source Table: threshold")
default int updateByPrimaryKeySelective(ThresholdRecord record) { default int updateByPrimaryKeySelective(ThresholdRecord record) {
return UpdateDSL.updateWithMapper(this::update, thresholdRecord) return UpdateDSL.updateWithMapper(this::update, thresholdRecord)
.set(indicatorId).equalToWhenPresent(record::getIndicatorId) .set(indicatorId).equalToWhenPresent(record::getIndicatorId)

18
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java
View file

@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class UserActivityLogRecordDynamicSqlSupport { public final class UserActivityLogRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.352+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.555+01:00", comments="Source Table: user_activity_log")
public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord(); public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.352+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.555+01:00", comments="Source field: user_activity_log.id")
public static final SqlColumn<Long> id = userActivityLogRecord.id; public static final SqlColumn<Long> id = userActivityLogRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.352+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.555+01:00", comments="Source field: user_activity_log.user_uuid")
public static final SqlColumn<String> userUuid = userActivityLogRecord.userUuid; public static final SqlColumn<String> userUuid = userActivityLogRecord.userUuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.352+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.555+01:00", comments="Source field: user_activity_log.timestamp")
public static final SqlColumn<Long> timestamp = userActivityLogRecord.timestamp; public static final SqlColumn<Long> timestamp = userActivityLogRecord.timestamp;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.352+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.555+01:00", comments="Source field: user_activity_log.activity_type")
public static final SqlColumn<String> activityType = userActivityLogRecord.activityType; public static final SqlColumn<String> activityType = userActivityLogRecord.activityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.352+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source field: user_activity_log.entity_type")
public static final SqlColumn<String> entityType = userActivityLogRecord.entityType; public static final SqlColumn<String> entityType = userActivityLogRecord.entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source field: user_activity_log.entity_id")
public static final SqlColumn<String> entityId = userActivityLogRecord.entityId; public static final SqlColumn<String> entityId = userActivityLogRecord.entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source field: user_activity_log.message")
public static final SqlColumn<String> message = userActivityLogRecord.message; public static final SqlColumn<String> message = userActivityLogRecord.message;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.352+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.555+01:00", comments="Source Table: user_activity_log")
public static final class UserActivityLogRecord extends SqlTable { public static final class UserActivityLogRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface UserActivityLogRecordMapper { public interface UserActivityLogRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source Table: user_activity_log")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source Table: user_activity_log")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source Table: user_activity_log")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<UserActivityLogRecord> insertStatement); int insert(InsertStatementProvider<UserActivityLogRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source Table: user_activity_log")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -58,7 +58,7 @@ public interface UserActivityLogRecordMapper {
}) })
UserActivityLogRecord selectOne(SelectStatementProvider selectStatement); UserActivityLogRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source Table: user_activity_log")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -71,22 +71,22 @@ public interface UserActivityLogRecordMapper {
}) })
List<UserActivityLogRecord> selectMany(SelectStatementProvider selectStatement); List<UserActivityLogRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source Table: user_activity_log")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source Table: user_activity_log")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(userActivityLogRecord); .from(userActivityLogRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source Table: user_activity_log")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord); return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source Table: user_activity_log")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord) return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -94,7 +94,7 @@ public interface UserActivityLogRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.556+01:00", comments="Source Table: user_activity_log")
default int insert(UserActivityLogRecord record) { default int insert(UserActivityLogRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(userActivityLogRecord) .into(userActivityLogRecord)
@ -108,7 +108,7 @@ public interface UserActivityLogRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.557+01:00", comments="Source Table: user_activity_log")
default int insertSelective(UserActivityLogRecord record) { default int insertSelective(UserActivityLogRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(userActivityLogRecord) .into(userActivityLogRecord)
@ -122,19 +122,19 @@ public interface UserActivityLogRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.557+01:00", comments="Source Table: user_activity_log")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserActivityLogRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserActivityLogRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message) return SelectDSL.selectWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message)
.from(userActivityLogRecord); .from(userActivityLogRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.558+01:00", comments="Source Table: user_activity_log")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserActivityLogRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserActivityLogRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message)
.from(userActivityLogRecord); .from(userActivityLogRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.558+01:00", comments="Source Table: user_activity_log")
default UserActivityLogRecord selectByPrimaryKey(Long id_) { default UserActivityLogRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, userUuid, timestamp, activityType, entityType, entityId, message) return SelectDSL.selectWithMapper(this::selectOne, id, userUuid, timestamp, activityType, entityType, entityId, message)
.from(userActivityLogRecord) .from(userActivityLogRecord)
@ -143,7 +143,7 @@ public interface UserActivityLogRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.558+01:00", comments="Source Table: user_activity_log")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(UserActivityLogRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(UserActivityLogRecord record) {
return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord)
.set(userUuid).equalTo(record::getUserUuid) .set(userUuid).equalTo(record::getUserUuid)
@ -154,7 +154,7 @@ public interface UserActivityLogRecordMapper {
.set(message).equalTo(record::getMessage); .set(message).equalTo(record::getMessage);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.558+01:00", comments="Source Table: user_activity_log")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(UserActivityLogRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(UserActivityLogRecord record) {
return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord)
.set(userUuid).equalToWhenPresent(record::getUserUuid) .set(userUuid).equalToWhenPresent(record::getUserUuid)
@ -165,7 +165,7 @@ public interface UserActivityLogRecordMapper {
.set(message).equalToWhenPresent(record::getMessage); .set(message).equalToWhenPresent(record::getMessage);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.558+01:00", comments="Source Table: user_activity_log")
default int updateByPrimaryKey(UserActivityLogRecord record) { default int updateByPrimaryKey(UserActivityLogRecord record) {
return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord)
.set(userUuid).equalTo(record::getUserUuid) .set(userUuid).equalTo(record::getUserUuid)
@ -179,7 +179,7 @@ public interface UserActivityLogRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.353+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.558+01:00", comments="Source Table: user_activity_log")
default int updateByPrimaryKeySelective(UserActivityLogRecord record) { default int updateByPrimaryKeySelective(UserActivityLogRecord record) {
return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord)
.set(userUuid).equalToWhenPresent(record::getUserUuid) .set(userUuid).equalToWhenPresent(record::getUserUuid)

24
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java
View file

@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class UserRecordDynamicSqlSupport { public final class UserRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source Table: user")
public static final UserRecord userRecord = new UserRecord(); public static final UserRecord userRecord = new UserRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source field: user.id")
public static final SqlColumn<Long> id = userRecord.id; public static final SqlColumn<Long> id = userRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source field: user.institution_id")
public static final SqlColumn<Long> institutionId = userRecord.institutionId; public static final SqlColumn<Long> institutionId = userRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source field: user.uuid")
public static final SqlColumn<String> uuid = userRecord.uuid; public static final SqlColumn<String> uuid = userRecord.uuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source field: user.name")
public static final SqlColumn<String> name = userRecord.name; public static final SqlColumn<String> name = userRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source field: user.username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source field: user.username")
public static final SqlColumn<String> username = userRecord.username; public static final SqlColumn<String> username = userRecord.username;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source field: user.password")
public static final SqlColumn<String> password = userRecord.password; public static final SqlColumn<String> password = userRecord.password;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source field: user.email")
public static final SqlColumn<String> email = userRecord.email; public static final SqlColumn<String> email = userRecord.email;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source field: user.language") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source field: user.language")
public static final SqlColumn<String> language = userRecord.language; public static final SqlColumn<String> language = userRecord.language;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source field: user.timezone")
public static final SqlColumn<String> timezone = userRecord.timezone; public static final SqlColumn<String> timezone = userRecord.timezone;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source field: user.active")
public static final SqlColumn<Integer> active = userRecord.active; public static final SqlColumn<Integer> active = userRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source Table: user")
public static final class UserRecord extends SqlTable { public static final class UserRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface UserRecordMapper { public interface UserRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source Table: user")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.347+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source Table: user")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source Table: user")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<UserRecord> insertStatement); int insert(InsertStatementProvider<UserRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.549+01:00", comments="Source Table: user")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -61,7 +61,7 @@ public interface UserRecordMapper {
}) })
UserRecord selectOne(SelectStatementProvider selectStatement); UserRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -77,22 +77,22 @@ public interface UserRecordMapper {
}) })
List<UserRecord> selectMany(SelectStatementProvider selectStatement); List<UserRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(userRecord); .from(userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); return DeleteDSL.deleteFromWithMapper(this::delete, userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, userRecord) return DeleteDSL.deleteFromWithMapper(this::delete, userRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -100,7 +100,7 @@ public interface UserRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default int insert(UserRecord record) { default int insert(UserRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(userRecord) .into(userRecord)
@ -117,7 +117,7 @@ public interface UserRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default int insertSelective(UserRecord record) { default int insertSelective(UserRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(userRecord) .into(userRecord)
@ -134,19 +134,19 @@ public interface UserRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active)
.from(userRecord); .from(userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active)
.from(userRecord); .from(userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default UserRecord selectByPrimaryKey(Long id_) { default UserRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, username, password, email, language, timezone, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, username, password, email, language, timezone, active)
.from(userRecord) .from(userRecord)
@ -155,7 +155,7 @@ public interface UserRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(UserRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(UserRecord record) {
return UpdateDSL.updateWithMapper(this::update, userRecord) return UpdateDSL.updateWithMapper(this::update, userRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -169,7 +169,7 @@ public interface UserRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(UserRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(UserRecord record) {
return UpdateDSL.updateWithMapper(this::update, userRecord) return UpdateDSL.updateWithMapper(this::update, userRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -183,7 +183,7 @@ public interface UserRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default int updateByPrimaryKey(UserRecord record) { default int updateByPrimaryKey(UserRecord record) {
return UpdateDSL.updateWithMapper(this::update, userRecord) return UpdateDSL.updateWithMapper(this::update, userRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -200,7 +200,7 @@ public interface UserRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.348+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.550+01:00", comments="Source Table: user")
default int updateByPrimaryKeySelective(UserRecord record) { default int updateByPrimaryKeySelective(UserRecord record) {
return UpdateDSL.updateWithMapper(this::update, userRecord) return UpdateDSL.updateWithMapper(this::update, userRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

14
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java
View file

@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ViewRecordDynamicSqlSupport { public final class ViewRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.258+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.449+01:00", comments="Source Table: view")
public static final ViewRecord viewRecord = new ViewRecord(); public static final ViewRecord viewRecord = new ViewRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.259+01:00", comments="Source field: view.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.449+01:00", comments="Source field: view.id")
public static final SqlColumn<Long> id = viewRecord.id; public static final SqlColumn<Long> id = viewRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.259+01:00", comments="Source field: view.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.449+01:00", comments="Source field: view.name")
public static final SqlColumn<String> name = viewRecord.name; public static final SqlColumn<String> name = viewRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.261+01:00", comments="Source field: view.columns") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.450+01:00", comments="Source field: view.columns")
public static final SqlColumn<Integer> columns = viewRecord.columns; public static final SqlColumn<Integer> columns = viewRecord.columns;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.261+01:00", comments="Source field: view.position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.450+01:00", comments="Source field: view.position")
public static final SqlColumn<Integer> position = viewRecord.position; public static final SqlColumn<Integer> position = viewRecord.position;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.262+01:00", comments="Source field: view.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.450+01:00", comments="Source field: view.template_id")
public static final SqlColumn<Long> templateId = viewRecord.templateId; public static final SqlColumn<Long> templateId = viewRecord.templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.259+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.449+01:00", comments="Source Table: view")
public static final class ViewRecord extends SqlTable { public static final class ViewRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ViewRecordMapper { public interface ViewRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.262+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.450+01:00", comments="Source Table: view")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.262+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.451+01:00", comments="Source Table: view")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.262+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.451+01:00", comments="Source Table: view")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ViewRecord> insertStatement); int insert(InsertStatementProvider<ViewRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.262+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.451+01:00", comments="Source Table: view")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -56,7 +56,7 @@ public interface ViewRecordMapper {
}) })
ViewRecord selectOne(SelectStatementProvider selectStatement); ViewRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.262+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.451+01:00", comments="Source Table: view")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -67,22 +67,22 @@ public interface ViewRecordMapper {
}) })
List<ViewRecord> selectMany(SelectStatementProvider selectStatement); List<ViewRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.262+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.451+01:00", comments="Source Table: view")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.263+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.451+01:00", comments="Source Table: view")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(viewRecord); .from(viewRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.263+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.452+01:00", comments="Source Table: view")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord); return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.263+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.452+01:00", comments="Source Table: view")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord) return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -90,7 +90,7 @@ public interface ViewRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.263+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.452+01:00", comments="Source Table: view")
default int insert(ViewRecord record) { default int insert(ViewRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(viewRecord) .into(viewRecord)
@ -102,7 +102,7 @@ public interface ViewRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.263+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.452+01:00", comments="Source Table: view")
default int insertSelective(ViewRecord record) { default int insertSelective(ViewRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(viewRecord) .into(viewRecord)
@ -114,19 +114,19 @@ public interface ViewRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.263+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.452+01:00", comments="Source Table: view")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ViewRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ViewRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, name, columns, position, templateId) return SelectDSL.selectWithMapper(this::selectMany, id, name, columns, position, templateId)
.from(viewRecord); .from(viewRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.263+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.452+01:00", comments="Source Table: view")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ViewRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ViewRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, columns, position, templateId) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, columns, position, templateId)
.from(viewRecord); .from(viewRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.263+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.453+01:00", comments="Source Table: view")
default ViewRecord selectByPrimaryKey(Long id_) { default ViewRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, name, columns, position, templateId) return SelectDSL.selectWithMapper(this::selectOne, id, name, columns, position, templateId)
.from(viewRecord) .from(viewRecord)
@ -135,7 +135,7 @@ public interface ViewRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.263+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.453+01:00", comments="Source Table: view")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ViewRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ViewRecord record) {
return UpdateDSL.updateWithMapper(this::update, viewRecord) return UpdateDSL.updateWithMapper(this::update, viewRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -144,7 +144,7 @@ public interface ViewRecordMapper {
.set(templateId).equalTo(record::getTemplateId); .set(templateId).equalTo(record::getTemplateId);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.264+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.453+01:00", comments="Source Table: view")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ViewRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ViewRecord record) {
return UpdateDSL.updateWithMapper(this::update, viewRecord) return UpdateDSL.updateWithMapper(this::update, viewRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)
@ -153,7 +153,7 @@ public interface ViewRecordMapper {
.set(templateId).equalToWhenPresent(record::getTemplateId); .set(templateId).equalToWhenPresent(record::getTemplateId);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.264+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.453+01:00", comments="Source Table: view")
default int updateByPrimaryKey(ViewRecord record) { default int updateByPrimaryKey(ViewRecord record) {
return UpdateDSL.updateWithMapper(this::update, viewRecord) return UpdateDSL.updateWithMapper(this::update, viewRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -165,7 +165,7 @@ public interface ViewRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.264+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.453+01:00", comments="Source Table: view")
default int updateByPrimaryKeySelective(ViewRecord record) { default int updateByPrimaryKeySelective(ViewRecord record) {
return UpdateDSL.updateWithMapper(this::update, viewRecord) return UpdateDSL.updateWithMapper(this::update, viewRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)

10
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java
View file

@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class WebserviceServerInfoRecordDynamicSqlSupport { public final class WebserviceServerInfoRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.563+01:00", comments="Source Table: webservice_server_info")
public static final WebserviceServerInfoRecord webserviceServerInfoRecord = new WebserviceServerInfoRecord(); public static final WebserviceServerInfoRecord webserviceServerInfoRecord = new WebserviceServerInfoRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source field: webservice_server_info.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.563+01:00", comments="Source field: webservice_server_info.id")
public static final SqlColumn<Long> id = webserviceServerInfoRecord.id; public static final SqlColumn<Long> id = webserviceServerInfoRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source field: webservice_server_info.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.563+01:00", comments="Source field: webservice_server_info.uuid")
public static final SqlColumn<String> uuid = webserviceServerInfoRecord.uuid; public static final SqlColumn<String> uuid = webserviceServerInfoRecord.uuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.358+01:00", comments="Source field: webservice_server_info.service_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.563+01:00", comments="Source field: webservice_server_info.service_address")
public static final SqlColumn<String> serviceAddress = webserviceServerInfoRecord.serviceAddress; public static final SqlColumn<String> serviceAddress = webserviceServerInfoRecord.serviceAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.563+01:00", comments="Source Table: webservice_server_info")
public static final class WebserviceServerInfoRecord extends SqlTable { public static final class WebserviceServerInfoRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface WebserviceServerInfoRecordMapper { public interface WebserviceServerInfoRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.563+01:00", comments="Source Table: webservice_server_info")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.563+01:00", comments="Source Table: webservice_server_info")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.563+01:00", comments="Source Table: webservice_server_info")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<WebserviceServerInfoRecord> insertStatement); int insert(InsertStatementProvider<WebserviceServerInfoRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.563+01:00", comments="Source Table: webservice_server_info")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -54,7 +54,7 @@ public interface WebserviceServerInfoRecordMapper {
}) })
WebserviceServerInfoRecord selectOne(SelectStatementProvider selectStatement); WebserviceServerInfoRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.564+01:00", comments="Source Table: webservice_server_info")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -63,22 +63,22 @@ public interface WebserviceServerInfoRecordMapper {
}) })
List<WebserviceServerInfoRecord> selectMany(SelectStatementProvider selectStatement); List<WebserviceServerInfoRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.564+01:00", comments="Source Table: webservice_server_info")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.564+01:00", comments="Source Table: webservice_server_info")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(webserviceServerInfoRecord); .from(webserviceServerInfoRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.564+01:00", comments="Source Table: webservice_server_info")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord); return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.564+01:00", comments="Source Table: webservice_server_info")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord) return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -86,7 +86,7 @@ public interface WebserviceServerInfoRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.565+01:00", comments="Source Table: webservice_server_info")
default int insert(WebserviceServerInfoRecord record) { default int insert(WebserviceServerInfoRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(webserviceServerInfoRecord) .into(webserviceServerInfoRecord)
@ -96,7 +96,7 @@ public interface WebserviceServerInfoRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.565+01:00", comments="Source Table: webservice_server_info")
default int insertSelective(WebserviceServerInfoRecord record) { default int insertSelective(WebserviceServerInfoRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(webserviceServerInfoRecord) .into(webserviceServerInfoRecord)
@ -106,19 +106,19 @@ public interface WebserviceServerInfoRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.565+01:00", comments="Source Table: webservice_server_info")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<WebserviceServerInfoRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<WebserviceServerInfoRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, uuid, serviceAddress) return SelectDSL.selectWithMapper(this::selectMany, id, uuid, serviceAddress)
.from(webserviceServerInfoRecord); .from(webserviceServerInfoRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.565+01:00", comments="Source Table: webservice_server_info")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<WebserviceServerInfoRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<WebserviceServerInfoRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, uuid, serviceAddress) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, uuid, serviceAddress)
.from(webserviceServerInfoRecord); .from(webserviceServerInfoRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.565+01:00", comments="Source Table: webservice_server_info")
default WebserviceServerInfoRecord selectByPrimaryKey(Long id_) { default WebserviceServerInfoRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, uuid, serviceAddress) return SelectDSL.selectWithMapper(this::selectOne, id, uuid, serviceAddress)
.from(webserviceServerInfoRecord) .from(webserviceServerInfoRecord)
@ -127,21 +127,21 @@ public interface WebserviceServerInfoRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.565+01:00", comments="Source Table: webservice_server_info")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(WebserviceServerInfoRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(WebserviceServerInfoRecord record) {
return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord)
.set(uuid).equalTo(record::getUuid) .set(uuid).equalTo(record::getUuid)
.set(serviceAddress).equalTo(record::getServiceAddress); .set(serviceAddress).equalTo(record::getServiceAddress);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.359+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.565+01:00", comments="Source Table: webservice_server_info")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(WebserviceServerInfoRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(WebserviceServerInfoRecord record) {
return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord)
.set(uuid).equalToWhenPresent(record::getUuid) .set(uuid).equalToWhenPresent(record::getUuid)
.set(serviceAddress).equalToWhenPresent(record::getServiceAddress); .set(serviceAddress).equalToWhenPresent(record::getServiceAddress);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.361+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.565+01:00", comments="Source Table: webservice_server_info")
default int updateByPrimaryKey(WebserviceServerInfoRecord record) { default int updateByPrimaryKey(WebserviceServerInfoRecord record) {
return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord)
.set(uuid).equalTo(record::getUuid) .set(uuid).equalTo(record::getUuid)
@ -151,7 +151,7 @@ public interface WebserviceServerInfoRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.361+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.565+01:00", comments="Source Table: webservice_server_info")
default int updateByPrimaryKeySelective(WebserviceServerInfoRecord record) { default int updateByPrimaryKeySelective(WebserviceServerInfoRecord record) {
return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord) return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord)
.set(uuid).equalToWhenPresent(record::getUuid) .set(uuid).equalToWhenPresent(record::getUuid)

28
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java
View file

@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class AdditionalAttributeRecord { public class AdditionalAttributeRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source field: additional_attributes.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source field: additional_attributes.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source field: additional_attributes.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source field: additional_attributes.entity_type")
private String entityType; private String entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source field: additional_attributes.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source field: additional_attributes.entity_id")
private Long entityId; private Long entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source field: additional_attributes.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source field: additional_attributes.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source field: additional_attributes.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source field: additional_attributes.value")
private String value; private String value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source Table: additional_attributes")
public AdditionalAttributeRecord(Long id, String entityType, Long entityId, String name, String value) { public AdditionalAttributeRecord(Long id, String entityType, Long entityId, String name, String value) {
this.id = id; this.id = id;
this.entityType = entityType; this.entityType = entityType;
@ -27,27 +27,27 @@ public class AdditionalAttributeRecord {
this.value = value; this.value = value;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source field: additional_attributes.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source field: additional_attributes.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source field: additional_attributes.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source field: additional_attributes.entity_type")
public String getEntityType() { public String getEntityType() {
return entityType; return entityType;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source field: additional_attributes.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source field: additional_attributes.entity_id")
public Long getEntityId() { public Long getEntityId() {
return entityId; return entityId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source field: additional_attributes.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source field: additional_attributes.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.354+01:00", comments="Source field: additional_attributes.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.559+01:00", comments="Source field: additional_attributes.value")
public String getValue() { public String getValue() {
return value; return value;
} }
@ -56,7 +56,7 @@ public class AdditionalAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table additional_attributes * This method corresponds to the database table additional_attributes
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class AdditionalAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table additional_attributes * This method corresponds to the database table additional_attributes
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class AdditionalAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table additional_attributes * This method corresponds to the database table additional_attributes
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

44
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java
View file

@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ClientConnectionRecord { public class ClientConnectionRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.522+01:00", comments="Source field: client_connection.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.522+01:00", comments="Source field: client_connection.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.status")
private String status; private String status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.connection_token")
private String connectionToken; private String connectionToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.exam_user_session_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.exam_user_session_id")
private String examUserSessionId; private String examUserSessionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.client_address")
private String clientAddress; private String clientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.virtual_client_address")
private String virtualClientAddress; private String virtualClientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source field: client_connection.creation_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.creation_time")
private Long creationTime; private Long creationTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.522+01:00", comments="Source Table: client_connection")
public ClientConnectionRecord(Long id, Long institutionId, Long examId, String status, String connectionToken, String examUserSessionId, String clientAddress, String virtualClientAddress, Long creationTime) { public ClientConnectionRecord(Long id, Long institutionId, Long examId, String status, String connectionToken, String examUserSessionId, String clientAddress, String virtualClientAddress, Long creationTime) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -43,47 +43,47 @@ public class ClientConnectionRecord {
this.creationTime = creationTime; this.creationTime = creationTime;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.522+01:00", comments="Source field: client_connection.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.522+01:00", comments="Source field: client_connection.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.exam_id")
public Long getExamId() { public Long getExamId() {
return examId; return examId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.status")
public String getStatus() { public String getStatus() {
return status; return status;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.connection_token")
public String getConnectionToken() { public String getConnectionToken() {
return connectionToken; return connectionToken;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.315+01:00", comments="Source field: client_connection.exam_user_session_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.exam_user_session_id")
public String getExamUserSessionId() { public String getExamUserSessionId() {
return examUserSessionId; return examUserSessionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.client_address")
public String getClientAddress() { public String getClientAddress() {
return clientAddress; return clientAddress;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.virtual_client_address")
public String getVirtualClientAddress() { public String getVirtualClientAddress() {
return virtualClientAddress; return virtualClientAddress;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.316+01:00", comments="Source field: client_connection.creation_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.523+01:00", comments="Source field: client_connection.creation_time")
public Long getCreationTime() { public Long getCreationTime() {
return creationTime; return creationTime;
} }
@ -92,7 +92,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -117,7 +117,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -146,7 +146,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

52
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java
View file

@ -4,28 +4,28 @@ import java.math.BigDecimal;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ClientEventRecord { public class ClientEventRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source field: client_event.connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.connection_id")
private Long connectionId; private Long connectionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.type")
private Integer type; private Integer type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.client_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.client_time")
private Long clientTime; private Long clientTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.server_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.528+01:00", comments="Source field: client_event.server_time")
private Long serverTime; private Long serverTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.528+01:00", comments="Source field: client_event.numeric_value")
private BigDecimal numericValue; private BigDecimal numericValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.528+01:00", comments="Source field: client_event.text")
private String text; private String text;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source Table: client_event")
public ClientEventRecord(Long id, Long connectionId, Integer type, Long clientTime, Long serverTime, BigDecimal numericValue, String text) { public ClientEventRecord(Long id, Long connectionId, Integer type, Long clientTime, Long serverTime, BigDecimal numericValue, String text) {
this.id = id; this.id = id;
this.connectionId = connectionId; this.connectionId = connectionId;
@ -36,77 +36,77 @@ public class ClientEventRecord {
this.text = text; this.text = text;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source Table: client_event")
public ClientEventRecord() { public ClientEventRecord() {
super(); super();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.318+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.id")
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.connection_id")
public Long getConnectionId() { public Long getConnectionId() {
return connectionId; return connectionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.connection_id")
public void setConnectionId(Long connectionId) { public void setConnectionId(Long connectionId) {
this.connectionId = connectionId; this.connectionId = connectionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.type")
public Integer getType() { public Integer getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.type")
public void setType(Integer type) { public void setType(Integer type) {
this.type = type; this.type = type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.client_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.client_time")
public Long getClientTime() { public Long getClientTime() {
return clientTime; return clientTime;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.client_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.527+01:00", comments="Source field: client_event.client_time")
public void setClientTime(Long clientTime) { public void setClientTime(Long clientTime) {
this.clientTime = clientTime; this.clientTime = clientTime;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.server_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.528+01:00", comments="Source field: client_event.server_time")
public Long getServerTime() { public Long getServerTime() {
return serverTime; return serverTime;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.server_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.528+01:00", comments="Source field: client_event.server_time")
public void setServerTime(Long serverTime) { public void setServerTime(Long serverTime) {
this.serverTime = serverTime; this.serverTime = serverTime;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.528+01:00", comments="Source field: client_event.numeric_value")
public BigDecimal getNumericValue() { public BigDecimal getNumericValue() {
return numericValue; return numericValue;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.528+01:00", comments="Source field: client_event.numeric_value")
public void setNumericValue(BigDecimal numericValue) { public void setNumericValue(BigDecimal numericValue) {
this.numericValue = numericValue; this.numericValue = numericValue;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.528+01:00", comments="Source field: client_event.text")
public String getText() { public String getText() {
return text; return text;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.319+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.528+01:00", comments="Source field: client_event.text")
public void setText(String text) { public void setText(String text) {
this.text = text == null ? null : text.trim(); this.text = text == null ? null : text.trim();
} }
@ -115,7 +115,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -138,7 +138,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -165,7 +165,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

40
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java
View file

@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ConfigurationAttributeRecord { public class ConfigurationAttributeRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.058+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.193+01:00", comments="Source field: configuration_attribute.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.059+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.195+01:00", comments="Source field: configuration_attribute.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.059+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.196+01:00", comments="Source field: configuration_attribute.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.061+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.196+01:00", comments="Source field: configuration_attribute.parent_id")
private Long parentId; private Long parentId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.062+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.196+01:00", comments="Source field: configuration_attribute.resources")
private String resources; private String resources;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.062+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.196+01:00", comments="Source field: configuration_attribute.validator")
private String validator; private String validator;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.062+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.197+01:00", comments="Source field: configuration_attribute.dependencies")
private String dependencies; private String dependencies;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.062+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.197+01:00", comments="Source field: configuration_attribute.default_value")
private String defaultValue; private String defaultValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.053+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.185+01:00", comments="Source Table: configuration_attribute")
public ConfigurationAttributeRecord(Long id, String name, String type, Long parentId, String resources, String validator, String dependencies, String defaultValue) { public ConfigurationAttributeRecord(Long id, String name, String type, Long parentId, String resources, String validator, String dependencies, String defaultValue) {
this.id = id; this.id = id;
this.name = name; this.name = name;
@ -39,42 +39,42 @@ public class ConfigurationAttributeRecord {
this.defaultValue = defaultValue; this.defaultValue = defaultValue;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.059+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.195+01:00", comments="Source field: configuration_attribute.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.059+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.196+01:00", comments="Source field: configuration_attribute.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.061+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.196+01:00", comments="Source field: configuration_attribute.type")
public String getType() { public String getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.062+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.196+01:00", comments="Source field: configuration_attribute.parent_id")
public Long getParentId() { public Long getParentId() {
return parentId; return parentId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.062+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.196+01:00", comments="Source field: configuration_attribute.resources")
public String getResources() { public String getResources() {
return resources; return resources;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.062+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.196+01:00", comments="Source field: configuration_attribute.validator")
public String getValidator() { public String getValidator() {
return validator; return validator;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.062+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.197+01:00", comments="Source field: configuration_attribute.dependencies")
public String getDependencies() { public String getDependencies() {
return dependencies; return dependencies;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.062+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.197+01:00", comments="Source field: configuration_attribute.default_value")
public String getDefaultValue() { public String getDefaultValue() {
return defaultValue; return defaultValue;
} }
@ -83,7 +83,7 @@ public class ConfigurationAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_attribute * This method corresponds to the database table configuration_attribute
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -107,7 +107,7 @@ public class ConfigurationAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_attribute * This method corresponds to the database table configuration_attribute
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -135,7 +135,7 @@ public class ConfigurationAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_attribute * This method corresponds to the database table configuration_attribute
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

40
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java
View file

@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ConfigurationNodeRecord { public class ConfigurationNodeRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.290+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.484+01:00", comments="Source field: configuration_node.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.290+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.484+01:00", comments="Source field: configuration_node.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.290+01:00", comments="Source field: configuration_node.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.484+01:00", comments="Source field: configuration_node.template_id")
private Long templateId; private Long templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.291+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.484+01:00", comments="Source field: configuration_node.owner")
private String owner; private String owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.291+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.484+01:00", comments="Source field: configuration_node.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.291+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.485+01:00", comments="Source field: configuration_node.description")
private String description; private String description;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.291+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.485+01:00", comments="Source field: configuration_node.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.291+01:00", comments="Source field: configuration_node.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.485+01:00", comments="Source field: configuration_node.status")
private String status; private String status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.290+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.483+01:00", comments="Source Table: configuration_node")
public ConfigurationNodeRecord(Long id, Long institutionId, Long templateId, String owner, String name, String description, String type, String status) { public ConfigurationNodeRecord(Long id, Long institutionId, Long templateId, String owner, String name, String description, String type, String status) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -39,42 +39,42 @@ public class ConfigurationNodeRecord {
this.status = status; this.status = status;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.290+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.484+01:00", comments="Source field: configuration_node.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.290+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.484+01:00", comments="Source field: configuration_node.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.290+01:00", comments="Source field: configuration_node.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.484+01:00", comments="Source field: configuration_node.template_id")
public Long getTemplateId() { public Long getTemplateId() {
return templateId; return templateId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.291+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.484+01:00", comments="Source field: configuration_node.owner")
public String getOwner() { public String getOwner() {
return owner; return owner;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.291+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.485+01:00", comments="Source field: configuration_node.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.291+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.485+01:00", comments="Source field: configuration_node.description")
public String getDescription() { public String getDescription() {
return description; return description;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.291+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.485+01:00", comments="Source field: configuration_node.type")
public String getType() { public String getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.291+01:00", comments="Source field: configuration_node.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.485+01:00", comments="Source field: configuration_node.status")
public String getStatus() { public String getStatus() {
return status; return status;
} }
@ -83,7 +83,7 @@ public class ConfigurationNodeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_node * This method corresponds to the database table configuration_node
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -107,7 +107,7 @@ public class ConfigurationNodeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_node * This method corresponds to the database table configuration_node
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -135,7 +135,7 @@ public class ConfigurationNodeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_node * This method corresponds to the database table configuration_node
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

32
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java
View file

@ -4,25 +4,25 @@ import javax.annotation.Generated;
import org.joda.time.DateTime; import org.joda.time.DateTime;
public class ConfigurationRecord { public class ConfigurationRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.281+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.472+01:00", comments="Source field: configuration.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.282+01:00", comments="Source field: configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.475+01:00", comments="Source field: configuration.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.282+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.476+01:00", comments="Source field: configuration.configuration_node_id")
private Long configurationNodeId; private Long configurationNodeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.282+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.476+01:00", comments="Source field: configuration.version")
private String version; private String version;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.282+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.476+01:00", comments="Source field: configuration.version_date")
private DateTime versionDate; private DateTime versionDate;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.282+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.476+01:00", comments="Source field: configuration.followup")
private Integer followup; private Integer followup;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.281+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.472+01:00", comments="Source Table: configuration")
public ConfigurationRecord(Long id, Long institutionId, Long configurationNodeId, String version, DateTime versionDate, Integer followup) { public ConfigurationRecord(Long id, Long institutionId, Long configurationNodeId, String version, DateTime versionDate, Integer followup) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -32,32 +32,32 @@ public class ConfigurationRecord {
this.followup = followup; this.followup = followup;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.281+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.472+01:00", comments="Source field: configuration.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.282+01:00", comments="Source field: configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.476+01:00", comments="Source field: configuration.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.282+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.476+01:00", comments="Source field: configuration.configuration_node_id")
public Long getConfigurationNodeId() { public Long getConfigurationNodeId() {
return configurationNodeId; return configurationNodeId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.282+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.476+01:00", comments="Source field: configuration.version")
public String getVersion() { public String getVersion() {
return version; return version;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.282+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.476+01:00", comments="Source field: configuration.version_date")
public DateTime getVersionDate() { public DateTime getVersionDate() {
return versionDate; return versionDate;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.283+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.476+01:00", comments="Source field: configuration.followup")
public Integer getFollowup() { public Integer getFollowup() {
return followup; return followup;
} }
@ -66,7 +66,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -88,7 +88,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -114,7 +114,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

32
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java
View file

@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ConfigurationValueRecord { public class ConfigurationValueRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.251+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source field: configuration_value.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.251+01:00", comments="Source field: configuration_value.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source field: configuration_value.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.252+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source field: configuration_value.configuration_id")
private Long configurationId; private Long configurationId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.252+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source field: configuration_value.configuration_attribute_id")
private Long configurationAttributeId; private Long configurationAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.252+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source field: configuration_value.list_index")
private Integer listIndex; private Integer listIndex;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.252+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.444+01:00", comments="Source field: configuration_value.value")
private String value; private String value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.251+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source Table: configuration_value")
public ConfigurationValueRecord(Long id, Long institutionId, Long configurationId, Long configurationAttributeId, Integer listIndex, String value) { public ConfigurationValueRecord(Long id, Long institutionId, Long configurationId, Long configurationAttributeId, Integer listIndex, String value) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -31,32 +31,32 @@ public class ConfigurationValueRecord {
this.value = value; this.value = value;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.251+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source field: configuration_value.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.251+01:00", comments="Source field: configuration_value.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source field: configuration_value.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.252+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source field: configuration_value.configuration_id")
public Long getConfigurationId() { public Long getConfigurationId() {
return configurationId; return configurationId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.252+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source field: configuration_value.configuration_attribute_id")
public Long getConfigurationAttributeId() { public Long getConfigurationAttributeId() {
return configurationAttributeId; return configurationAttributeId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.252+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.443+01:00", comments="Source field: configuration_value.list_index")
public Integer getListIndex() { public Integer getListIndex() {
return listIndex; return listIndex;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.252+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.444+01:00", comments="Source field: configuration_value.value")
public String getValue() { public String getValue() {
return value; return value;
} }
@ -65,7 +65,7 @@ public class ConfigurationValueRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_value * This method corresponds to the database table configuration_value
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -87,7 +87,7 @@ public class ConfigurationValueRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_value * This method corresponds to the database table configuration_value
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -113,7 +113,7 @@ public class ConfigurationValueRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_value * This method corresponds to the database table configuration_value
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

32
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java
View file

@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ExamConfigurationMapRecord { public class ExamConfigurationMapRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.299+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.512+01:00", comments="Source field: exam_configuration_map.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.512+01:00", comments="Source field: exam_configuration_map.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.512+01:00", comments="Source field: exam_configuration_map.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.512+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
private Long configurationNodeId; private Long configurationNodeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.513+01:00", comments="Source field: exam_configuration_map.user_names")
private String userNames; private String userNames;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.513+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
private String encryptSecret; private String encryptSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.299+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.512+01:00", comments="Source Table: exam_configuration_map")
public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String userNames, String encryptSecret) { public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String userNames, String encryptSecret) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -31,32 +31,32 @@ public class ExamConfigurationMapRecord {
this.encryptSecret = encryptSecret; this.encryptSecret = encryptSecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.512+01:00", comments="Source field: exam_configuration_map.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.512+01:00", comments="Source field: exam_configuration_map.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.512+01:00", comments="Source field: exam_configuration_map.exam_id")
public Long getExamId() { public Long getExamId() {
return examId; return examId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.513+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
public Long getConfigurationNodeId() { public Long getConfigurationNodeId() {
return configurationNodeId; return configurationNodeId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.513+01:00", comments="Source field: exam_configuration_map.user_names")
public String getUserNames() { public String getUserNames() {
return userNames; return userNames;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.300+01:00", comments="Source field: exam_configuration_map.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.513+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
public String getEncryptSecret() { public String getEncryptSecret() {
return encryptSecret; return encryptSecret;
} }
@ -65,7 +65,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -87,7 +87,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -113,7 +113,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

74
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java
View file

@ -3,47 +3,50 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ExamRecord { public class ExamRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.306+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.517+01:00", comments="Source field: exam.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.306+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.306+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.lms_setup_id")
private Long lmsSetupId; private Long lmsSetupId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.external_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.external_id")
private String externalId; private String externalId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.owner")
private String owner; private String owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.supporter")
private String supporter; private String supporter;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.quit_password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.quit_password")
private String quitPassword; private String quitPassword;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source field: exam.browser_keys") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.browser_keys")
private String browserKeys; private String browserKeys;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source field: exam.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.status")
private String status; private String status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source field: exam.updating") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.lms_seb_restriction")
private Integer lmsSebRestriction;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.updating")
private Integer updating; private Integer updating;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source field: exam.lastupdate") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.lastupdate")
private String lastupdate; private String lastupdate;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.306+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.517+01:00", comments="Source Table: exam")
public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String quitPassword, String browserKeys, String status, Integer updating, String lastupdate, Integer active) { public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String quitPassword, String browserKeys, String status, Integer lmsSebRestriction, Integer updating, String lastupdate, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
this.lmsSetupId = lmsSetupId; this.lmsSetupId = lmsSetupId;
@ -54,72 +57,78 @@ public class ExamRecord {
this.quitPassword = quitPassword; this.quitPassword = quitPassword;
this.browserKeys = browserKeys; this.browserKeys = browserKeys;
this.status = status; this.status = status;
this.lmsSebRestriction = lmsSebRestriction;
this.updating = updating; this.updating = updating;
this.lastupdate = lastupdate; this.lastupdate = lastupdate;
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.306+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.517+01:00", comments="Source field: exam.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.306+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.lms_setup_id")
public Long getLmsSetupId() { public Long getLmsSetupId() {
return lmsSetupId; return lmsSetupId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.external_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.external_id")
public String getExternalId() { public String getExternalId() {
return externalId; return externalId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.owner")
public String getOwner() { public String getOwner() {
return owner; return owner;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.supporter")
public String getSupporter() { public String getSupporter() {
return supporter; return supporter;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.type")
public String getType() { public String getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.307+01:00", comments="Source field: exam.quit_password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.518+01:00", comments="Source field: exam.quit_password")
public String getQuitPassword() { public String getQuitPassword() {
return quitPassword; return quitPassword;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source field: exam.browser_keys") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.browser_keys")
public String getBrowserKeys() { public String getBrowserKeys() {
return browserKeys; return browserKeys;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source field: exam.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.status")
public String getStatus() { public String getStatus() {
return status; return status;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source field: exam.updating") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.lms_seb_restriction")
public Integer getLmsSebRestriction() {
return lmsSebRestriction;
}
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.updating")
public Integer getUpdating() { public Integer getUpdating() {
return updating; return updating;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source field: exam.lastupdate") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.lastupdate")
public String getLastupdate() { public String getLastupdate() {
return lastupdate; return lastupdate;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.308+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.519+01:00", comments="Source field: exam.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -128,7 +137,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -146,6 +155,7 @@ public class ExamRecord {
sb.append(", quitPassword=").append(quitPassword); sb.append(", quitPassword=").append(quitPassword);
sb.append(", browserKeys=").append(browserKeys); sb.append(", browserKeys=").append(browserKeys);
sb.append(", status=").append(status); sb.append(", status=").append(status);
sb.append(", lmsSebRestriction=").append(lmsSebRestriction);
sb.append(", updating=").append(updating); sb.append(", updating=").append(updating);
sb.append(", lastupdate=").append(lastupdate); sb.append(", lastupdate=").append(lastupdate);
sb.append(", active=").append(active); sb.append(", active=").append(active);
@ -157,7 +167,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -181,6 +191,7 @@ public class ExamRecord {
&& (this.getQuitPassword() == null ? other.getQuitPassword() == null : this.getQuitPassword().equals(other.getQuitPassword())) && (this.getQuitPassword() == null ? other.getQuitPassword() == null : this.getQuitPassword().equals(other.getQuitPassword()))
&& (this.getBrowserKeys() == null ? other.getBrowserKeys() == null : this.getBrowserKeys().equals(other.getBrowserKeys())) && (this.getBrowserKeys() == null ? other.getBrowserKeys() == null : this.getBrowserKeys().equals(other.getBrowserKeys()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getLmsSebRestriction() == null ? other.getLmsSebRestriction() == null : this.getLmsSebRestriction().equals(other.getLmsSebRestriction()))
&& (this.getUpdating() == null ? other.getUpdating() == null : this.getUpdating().equals(other.getUpdating())) && (this.getUpdating() == null ? other.getUpdating() == null : this.getUpdating().equals(other.getUpdating()))
&& (this.getLastupdate() == null ? other.getLastupdate() == null : this.getLastupdate().equals(other.getLastupdate())) && (this.getLastupdate() == null ? other.getLastupdate() == null : this.getLastupdate().equals(other.getLastupdate()))
&& (this.getActive() == null ? other.getActive() == null : this.getActive().equals(other.getActive())); && (this.getActive() == null ? other.getActive() == null : this.getActive().equals(other.getActive()));
@ -190,7 +201,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {
@ -206,6 +217,7 @@ public class ExamRecord {
result = prime * result + ((getQuitPassword() == null) ? 0 : getQuitPassword().hashCode()); result = prime * result + ((getQuitPassword() == null) ? 0 : getQuitPassword().hashCode());
result = prime * result + ((getBrowserKeys() == null) ? 0 : getBrowserKeys().hashCode()); result = prime * result + ((getBrowserKeys() == null) ? 0 : getBrowserKeys().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getLmsSebRestriction() == null) ? 0 : getLmsSebRestriction().hashCode());
result = prime * result + ((getUpdating() == null) ? 0 : getUpdating().hashCode()); result = prime * result + ((getUpdating() == null) ? 0 : getUpdating().hashCode());
result = prime * result + ((getLastupdate() == null) ? 0 : getLastupdate().hashCode()); result = prime * result + ((getLastupdate() == null) ? 0 : getLastupdate().hashCode());
result = prime * result + ((getActive() == null) ? 0 : getActive().hashCode()); result = prime * result + ((getActive() == null) ? 0 : getActive().hashCode());

28
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java
View file

@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class IndicatorRecord { public class IndicatorRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.322+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source field: indicator.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.322+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source field: indicator.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source field: indicator.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source field: indicator.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source field: indicator.color")
private String color; private String color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.322+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source Table: indicator")
public IndicatorRecord(Long id, Long examId, String type, String name, String color) { public IndicatorRecord(Long id, Long examId, String type, String name, String color) {
this.id = id; this.id = id;
this.examId = examId; this.examId = examId;
@ -27,27 +27,27 @@ public class IndicatorRecord {
this.color = color; this.color = color;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.322+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source field: indicator.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source field: indicator.exam_id")
public Long getExamId() { public Long getExamId() {
return examId; return examId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source field: indicator.type")
public String getType() { public String getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source field: indicator.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.323+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.531+01:00", comments="Source field: indicator.color")
public String getColor() { public String getColor() {
return color; return color;
} }
@ -56,7 +56,7 @@ public class IndicatorRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table indicator * This method corresponds to the database table indicator
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class IndicatorRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table indicator * This method corresponds to the database table indicator
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class IndicatorRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table indicator * This method corresponds to the database table indicator
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

32
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java
View file

@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class InstitutionRecord { public class InstitutionRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.url_suffix")
private String urlSuffix; private String urlSuffix;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.theme_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.theme_name")
private String themeName; private String themeName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.logo_image")
private String logoImage; private String logoImage;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source Table: institution")
public InstitutionRecord(Long id, String name, String urlSuffix, String themeName, Integer active, String logoImage) { public InstitutionRecord(Long id, String name, String urlSuffix, String themeName, Integer active, String logoImage) {
this.id = id; this.id = id;
this.name = name; this.name = name;
@ -31,32 +31,32 @@ public class InstitutionRecord {
this.logoImage = logoImage; this.logoImage = logoImage;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.url_suffix")
public String getUrlSuffix() { public String getUrlSuffix() {
return urlSuffix; return urlSuffix;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.theme_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.theme_name")
public String getThemeName() { public String getThemeName() {
return themeName; return themeName;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.332+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.537+01:00", comments="Source field: institution.logo_image")
public String getLogoImage() { public String getLogoImage() {
return logoImage; return logoImage;
} }
@ -65,7 +65,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -87,7 +87,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -113,7 +113,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

56
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java
View file

@ -3,43 +3,43 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class LmsSetupRecord { public class LmsSetupRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.338+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.544+01:00", comments="Source field: lms_setup.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.338+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.544+01:00", comments="Source field: lms_setup.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.338+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.544+01:00", comments="Source field: lms_setup.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.338+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.544+01:00", comments="Source field: lms_setup.lms_type")
private String lmsType; private String lmsType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.544+01:00", comments="Source field: lms_setup.lms_url")
private String lmsUrl; private String lmsUrl;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_clientname")
private String lmsClientname; private String lmsClientname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_clientsecret")
private String lmsClientsecret; private String lmsClientsecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_rest_api_token")
private String lmsRestApiToken; private String lmsRestApiToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_proxy_auth_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_proxy_auth_type")
private String lmsProxyAuthType; private String lmsProxyAuthType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_proxy_auth_username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
private String lmsProxyAuthUsername; private String lmsProxyAuthUsername;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
private String lmsProxyAuthSecret; private String lmsProxyAuthSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.338+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.544+01:00", comments="Source Table: lms_setup")
public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String lmsProxyAuthType, String lmsProxyAuthUsername, String lmsProxyAuthSecret, Integer active) { public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String lmsProxyAuthType, String lmsProxyAuthUsername, String lmsProxyAuthSecret, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -55,62 +55,62 @@ public class LmsSetupRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.338+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.544+01:00", comments="Source field: lms_setup.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.338+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.544+01:00", comments="Source field: lms_setup.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.338+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.544+01:00", comments="Source field: lms_setup.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.544+01:00", comments="Source field: lms_setup.lms_type")
public String getLmsType() { public String getLmsType() {
return lmsType; return lmsType;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_url")
public String getLmsUrl() { public String getLmsUrl() {
return lmsUrl; return lmsUrl;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_clientname")
public String getLmsClientname() { public String getLmsClientname() {
return lmsClientname; return lmsClientname;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_clientsecret")
public String getLmsClientsecret() { public String getLmsClientsecret() {
return lmsClientsecret; return lmsClientsecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_rest_api_token")
public String getLmsRestApiToken() { public String getLmsRestApiToken() {
return lmsRestApiToken; return lmsRestApiToken;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_proxy_auth_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_proxy_auth_type")
public String getLmsProxyAuthType() { public String getLmsProxyAuthType() {
return lmsProxyAuthType; return lmsProxyAuthType;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_proxy_auth_username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
public String getLmsProxyAuthUsername() { public String getLmsProxyAuthUsername() {
return lmsProxyAuthUsername; return lmsProxyAuthUsername;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
public String getLmsProxyAuthSecret() { public String getLmsProxyAuthSecret() {
return lmsProxyAuthSecret; return lmsProxyAuthSecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.339+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.545+01:00", comments="Source field: lms_setup.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -119,7 +119,7 @@ public class LmsSetupRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table lms_setup * This method corresponds to the database table lms_setup
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -147,7 +147,7 @@ public class LmsSetupRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table lms_setup * This method corresponds to the database table lms_setup
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -179,7 +179,7 @@ public class LmsSetupRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table lms_setup * This method corresponds to the database table lms_setup
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

48
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java
View file

@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class OrientationRecord { public class OrientationRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.265+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.454+01:00", comments="Source field: orientation.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.265+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.455+01:00", comments="Source field: orientation.config_attribute_id")
private Long configAttributeId; private Long configAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.265+01:00", comments="Source field: orientation.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.455+01:00", comments="Source field: orientation.template_id")
private Long templateId; private Long templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.265+01:00", comments="Source field: orientation.view_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.455+01:00", comments="Source field: orientation.view_id")
private Long viewId; private Long viewId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.265+01:00", comments="Source field: orientation.group_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.455+01:00", comments="Source field: orientation.group_id")
private String groupId; private String groupId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.266+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.456+01:00", comments="Source field: orientation.x_position")
private Integer xPosition; private Integer xPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.267+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.456+01:00", comments="Source field: orientation.y_position")
private Integer yPosition; private Integer yPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.267+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.456+01:00", comments="Source field: orientation.width")
private Integer width; private Integer width;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.268+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.457+01:00", comments="Source field: orientation.height")
private Integer height; private Integer height;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.268+01:00", comments="Source field: orientation.title") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.457+01:00", comments="Source field: orientation.title")
private String title; private String title;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.264+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.454+01: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) { 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.id = id;
this.configAttributeId = configAttributeId; this.configAttributeId = configAttributeId;
@ -47,52 +47,52 @@ public class OrientationRecord {
this.title = title; this.title = title;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.265+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.454+01:00", comments="Source field: orientation.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.265+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.455+01:00", comments="Source field: orientation.config_attribute_id")
public Long getConfigAttributeId() { public Long getConfigAttributeId() {
return configAttributeId; return configAttributeId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.265+01:00", comments="Source field: orientation.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.455+01:00", comments="Source field: orientation.template_id")
public Long getTemplateId() { public Long getTemplateId() {
return templateId; return templateId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.265+01:00", comments="Source field: orientation.view_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.455+01:00", comments="Source field: orientation.view_id")
public Long getViewId() { public Long getViewId() {
return viewId; return viewId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.266+01:00", comments="Source field: orientation.group_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.456+01:00", comments="Source field: orientation.group_id")
public String getGroupId() { public String getGroupId() {
return groupId; return groupId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.267+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.456+01:00", comments="Source field: orientation.x_position")
public Integer getxPosition() { public Integer getxPosition() {
return xPosition; return xPosition;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.267+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.456+01:00", comments="Source field: orientation.y_position")
public Integer getyPosition() { public Integer getyPosition() {
return yPosition; return yPosition;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.268+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.456+01:00", comments="Source field: orientation.width")
public Integer getWidth() { public Integer getWidth() {
return width; return width;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.268+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.457+01:00", comments="Source field: orientation.height")
public Integer getHeight() { public Integer getHeight() {
return height; return height;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.268+01:00", comments="Source field: orientation.title") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.457+01:00", comments="Source field: orientation.title")
public String getTitle() { public String getTitle() {
return title; return title;
} }
@ -101,7 +101,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -127,7 +127,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -157,7 +157,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

20
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java
View file

@ -3,33 +3,33 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class RoleRecord { public class RoleRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.552+01:00", comments="Source field: user_role.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.552+01:00", comments="Source field: user_role.user_id")
private Long userId; private Long userId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.552+01:00", comments="Source field: user_role.role_name")
private String roleName; private String roleName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.552+01:00", comments="Source Table: user_role")
public RoleRecord(Long id, Long userId, String roleName) { public RoleRecord(Long id, Long userId, String roleName) {
this.id = id; this.id = id;
this.userId = userId; this.userId = userId;
this.roleName = roleName; this.roleName = roleName;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.552+01:00", comments="Source field: user_role.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.552+01:00", comments="Source field: user_role.user_id")
public Long getUserId() { public Long getUserId() {
return userId; return userId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.349+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.553+01:00", comments="Source field: user_role.role_name")
public String getRoleName() { public String getRoleName() {
return roleName; return roleName;
} }
@ -38,7 +38,7 @@ public class RoleRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_role * This method corresponds to the database table user_role
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -57,7 +57,7 @@ public class RoleRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_role * This method corresponds to the database table user_role
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -80,7 +80,7 @@ public class RoleRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_role * This method corresponds to the database table user_role
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

40
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java
View file

@ -4,31 +4,31 @@ import javax.annotation.Generated;
import org.joda.time.DateTime; import org.joda.time.DateTime;
public class SebClientConfigRecord { public class SebClientConfigRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source field: seb_client_configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.540+01:00", comments="Source field: seb_client_configuration.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source field: seb_client_configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source field: seb_client_configuration.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source field: seb_client_configuration.date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.date")
private DateTime date; private DateTime date;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source field: seb_client_configuration.client_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.client_name")
private String clientName; private String clientName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.client_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.client_secret")
private String clientSecret; private String clientSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
private String encryptSecret; private String encryptSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.540+01: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) { public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, String encryptSecret, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -40,42 +40,42 @@ public class SebClientConfigRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source field: seb_client_configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.540+01:00", comments="Source field: seb_client_configuration.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source field: seb_client_configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source field: seb_client_configuration.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.335+01:00", comments="Source field: seb_client_configuration.date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.date")
public DateTime getDate() { public DateTime getDate() {
return date; return date;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.client_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.client_name")
public String getClientName() { public String getClientName() {
return clientName; return clientName;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.client_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.client_secret")
public String getClientSecret() { public String getClientSecret() {
return clientSecret; return clientSecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
public String getEncryptSecret() { public String getEncryptSecret() {
return encryptSecret; return encryptSecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.336+01:00", comments="Source field: seb_client_configuration.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.541+01:00", comments="Source field: seb_client_configuration.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -84,7 +84,7 @@ public class SebClientConfigRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table seb_client_configuration * This method corresponds to the database table seb_client_configuration
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -108,7 +108,7 @@ public class SebClientConfigRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table seb_client_configuration * This method corresponds to the database table seb_client_configuration
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -136,7 +136,7 @@ public class SebClientConfigRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table seb_client_configuration * This method corresponds to the database table seb_client_configuration
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

24
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java
View file

@ -4,19 +4,19 @@ import java.math.BigDecimal;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ThresholdRecord { public class ThresholdRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.328+01:00", comments="Source field: threshold.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.534+01:00", comments="Source field: threshold.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.329+01:00", comments="Source field: threshold.indicator_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.534+01:00", comments="Source field: threshold.indicator_id")
private Long indicatorId; private Long indicatorId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.329+01:00", comments="Source field: threshold.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.534+01:00", comments="Source field: threshold.value")
private BigDecimal value; private BigDecimal value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.329+01:00", comments="Source field: threshold.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.534+01:00", comments="Source field: threshold.color")
private String color; private String color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.328+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.534+01:00", comments="Source Table: threshold")
public ThresholdRecord(Long id, Long indicatorId, BigDecimal value, String color) { public ThresholdRecord(Long id, Long indicatorId, BigDecimal value, String color) {
this.id = id; this.id = id;
this.indicatorId = indicatorId; this.indicatorId = indicatorId;
@ -24,22 +24,22 @@ public class ThresholdRecord {
this.color = color; this.color = color;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.328+01:00", comments="Source field: threshold.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.534+01:00", comments="Source field: threshold.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.329+01:00", comments="Source field: threshold.indicator_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.534+01:00", comments="Source field: threshold.indicator_id")
public Long getIndicatorId() { public Long getIndicatorId() {
return indicatorId; return indicatorId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.329+01:00", comments="Source field: threshold.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.534+01:00", comments="Source field: threshold.value")
public BigDecimal getValue() { public BigDecimal getValue() {
return value; return value;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.329+01:00", comments="Source field: threshold.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.534+01:00", comments="Source field: threshold.color")
public String getColor() { public String getColor() {
return color; return color;
} }
@ -48,7 +48,7 @@ public class ThresholdRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table threshold * This method corresponds to the database table threshold
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -68,7 +68,7 @@ public class ThresholdRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table threshold * This method corresponds to the database table threshold
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -92,7 +92,7 @@ public class ThresholdRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table threshold * This method corresponds to the database table threshold
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

36
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java
View file

@ -3,28 +3,28 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class UserActivityLogRecord { public class UserActivityLogRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.user_uuid")
private String userUuid; private String userUuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.timestamp")
private Long timestamp; private Long timestamp;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.activity_type")
private String activityType; private String activityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.entity_type")
private String entityType; private String entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.entity_id")
private String entityId; private String entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.352+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.555+01:00", comments="Source field: user_activity_log.message")
private String message; private String message;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source Table: user_activity_log")
public UserActivityLogRecord(Long id, String userUuid, Long timestamp, String activityType, String entityType, String entityId, String message) { public UserActivityLogRecord(Long id, String userUuid, Long timestamp, String activityType, String entityType, String entityId, String message) {
this.id = id; this.id = id;
this.userUuid = userUuid; this.userUuid = userUuid;
@ -35,37 +35,37 @@ public class UserActivityLogRecord {
this.message = message; this.message = message;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.user_uuid")
public String getUserUuid() { public String getUserUuid() {
return userUuid; return userUuid;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.timestamp")
public Long getTimestamp() { public Long getTimestamp() {
return timestamp; return timestamp;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.activity_type")
public String getActivityType() { public String getActivityType() {
return activityType; return activityType;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.351+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.entity_type")
public String getEntityType() { public String getEntityType() {
return entityType; return entityType;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.352+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.554+01:00", comments="Source field: user_activity_log.entity_id")
public String getEntityId() { public String getEntityId() {
return entityId; return entityId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.352+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.555+01:00", comments="Source field: user_activity_log.message")
public String getMessage() { public String getMessage() {
return message; return message;
} }
@ -74,7 +74,7 @@ public class UserActivityLogRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_activity_log * This method corresponds to the database table user_activity_log
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -97,7 +97,7 @@ public class UserActivityLogRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_activity_log * This method corresponds to the database table user_activity_log
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -124,7 +124,7 @@ public class UserActivityLogRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_activity_log * This method corresponds to the database table user_activity_log
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

48
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java
View file

@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class UserRecord { public class UserRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.345+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.345+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.uuid")
private String uuid; private String uuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.username")
private String username; private String username;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.password")
private String password; private String password;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.email")
private String email; private String email;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.language") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.language")
private String language; private String language;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.timezone")
private String timezone; private String timezone;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.345+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source Table: user")
public UserRecord(Long id, Long institutionId, String uuid, String name, String username, String password, String email, String language, String timezone, Integer active) { 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.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -47,52 +47,52 @@ public class UserRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.345+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.uuid")
public String getUuid() { public String getUuid() {
return uuid; return uuid;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.username")
public String getUsername() { public String getUsername() {
return username; return username;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.password")
public String getPassword() { public String getPassword() {
return password; return password;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.email")
public String getEmail() { public String getEmail() {
return email; return email;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.language") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.language")
public String getLanguage() { public String getLanguage() {
return language; return language;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.timezone")
public String getTimezone() { public String getTimezone() {
return timezone; return timezone;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.346+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.548+01:00", comments="Source field: user.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -101,7 +101,7 @@ public class UserRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user * This method corresponds to the database table user
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -127,7 +127,7 @@ public class UserRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user * This method corresponds to the database table user
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -157,7 +157,7 @@ public class UserRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user * This method corresponds to the database table user
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

28
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java
View file

@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ViewRecord { public class ViewRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.257+01:00", comments="Source field: view.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.448+01:00", comments="Source field: view.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.257+01:00", comments="Source field: view.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.448+01:00", comments="Source field: view.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.257+01:00", comments="Source field: view.columns") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.448+01:00", comments="Source field: view.columns")
private Integer columns; private Integer columns;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.258+01:00", comments="Source field: view.position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.448+01:00", comments="Source field: view.position")
private Integer position; private Integer position;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.258+01:00", comments="Source field: view.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.448+01:00", comments="Source field: view.template_id")
private Long templateId; private Long templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.257+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.448+01:00", comments="Source Table: view")
public ViewRecord(Long id, String name, Integer columns, Integer position, Long templateId) { public ViewRecord(Long id, String name, Integer columns, Integer position, Long templateId) {
this.id = id; this.id = id;
this.name = name; this.name = name;
@ -27,27 +27,27 @@ public class ViewRecord {
this.templateId = templateId; this.templateId = templateId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.257+01:00", comments="Source field: view.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.448+01:00", comments="Source field: view.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.257+01:00", comments="Source field: view.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.448+01:00", comments="Source field: view.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.258+01:00", comments="Source field: view.columns") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.448+01:00", comments="Source field: view.columns")
public Integer getColumns() { public Integer getColumns() {
return columns; return columns;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.258+01:00", comments="Source field: view.position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.448+01:00", comments="Source field: view.position")
public Integer getPosition() { public Integer getPosition() {
return position; return position;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.258+01:00", comments="Source field: view.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.449+01:00", comments="Source field: view.template_id")
public Long getTemplateId() { public Long getTemplateId() {
return templateId; return templateId;
} }
@ -56,7 +56,7 @@ public class ViewRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table view * This method corresponds to the database table view
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class ViewRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table view * This method corresponds to the database table view
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class ViewRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table view * This method corresponds to the database table view
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

20
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java
View file

@ -3,33 +3,33 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class WebserviceServerInfoRecord { public class WebserviceServerInfoRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source field: webservice_server_info.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.562+01:00", comments="Source field: webservice_server_info.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source field: webservice_server_info.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.562+01:00", comments="Source field: webservice_server_info.uuid")
private String uuid; private String uuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source field: webservice_server_info.service_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.562+01:00", comments="Source field: webservice_server_info.service_address")
private String serviceAddress; private String serviceAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.562+01:00", comments="Source Table: webservice_server_info")
public WebserviceServerInfoRecord(Long id, String uuid, String serviceAddress) { public WebserviceServerInfoRecord(Long id, String uuid, String serviceAddress) {
this.id = id; this.id = id;
this.uuid = uuid; this.uuid = uuid;
this.serviceAddress = serviceAddress; this.serviceAddress = serviceAddress;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source field: webservice_server_info.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.562+01:00", comments="Source field: webservice_server_info.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source field: webservice_server_info.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.562+01:00", comments="Source field: webservice_server_info.uuid")
public String getUuid() { public String getUuid() {
return uuid; return uuid;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-28T13:38:46.357+01:00", comments="Source field: webservice_server_info.service_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-10-31T08:44:00.562+01:00", comments="Source field: webservice_server_info.service_address")
public String getServiceAddress() { public String getServiceAddress() {
return serviceAddress; return serviceAddress;
} }
@ -38,7 +38,7 @@ public class WebserviceServerInfoRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table webservice_server_info * This method corresponds to the database table webservice_server_info
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -57,7 +57,7 @@ public class WebserviceServerInfoRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table webservice_server_info * This method corresponds to the database table webservice_server_info
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -80,7 +80,7 @@ public class WebserviceServerInfoRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table webservice_server_info * This method corresponds to the database table webservice_server_info
* *
* @mbg.generated Mon Oct 28 13:38:46 CET 2019 * @mbg.generated Thu Oct 31 08:44:00 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

6
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamConfigurationMapDAO.java
View file

@ -49,6 +49,12 @@ public interface ExamConfigurationMapDAO extends
* the Exam for a specified user identifier */ * the Exam for a specified user identifier */
Result<Long> getUserConfigurationNodeId(final Long examId, final String userId); Result<Long> getUserConfigurationNodeId(final Long examId, final String userId);
/** Get a list of all ConfigurationNode identifiers of configurations that currently are attached to a given Exam
*
* @param examId the Exam identifier
* @return Result refers to a list of ConfigurationNode identifiers or refer to an error if happened */
Result<Collection<Long>> getConfigurationNodeIds(Long examId);
/** Get all id of Exams that has a relation to the given configuration id. /** Get all id of Exams that has a relation to the given configuration id.
* *
* @param configurationNodeId the configuration node identifier (PK) * @param configurationNodeId the configuration node identifier (PK)

16
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java
View file

@ -190,6 +190,7 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO {
} }
@Override @Override
@Transactional(readOnly = true)
public Result<Long> getUserConfigurationNodeId(final Long examId, final String userId) { public Result<Long> getUserConfigurationNodeId(final Long examId, final String userId) {
return Result.tryCatch(() -> this.examConfigurationMapRecordMapper return Result.tryCatch(() -> this.examConfigurationMapRecordMapper
.selectByExample() .selectByExample()
@ -206,6 +207,21 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO {
.collect(Utils.toSingleton())); .collect(Utils.toSingleton()));
} }
@Override
@Transactional(readOnly = true)
public Result<Collection<Long>> getConfigurationNodeIds(final Long examId) {
return Result.tryCatch(() -> this.examConfigurationMapRecordMapper
.selectByExample()
.where(
ExamConfigurationMapRecordDynamicSqlSupport.examId,
SqlBuilder.isEqualTo(examId))
.build()
.execute()
.stream()
.map(mapping -> mapping.getConfigurationNodeId())
.collect(Collectors.toList()));
}
@Override @Override
@Transactional @Transactional
public Result<ExamConfigurationMap> createNew(final ExamConfigurationMap data) { public Result<ExamConfigurationMap> createNew(final ExamConfigurationMap data) {

17
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
View file

@ -177,6 +177,7 @@ public class ExamDAOImpl implements ExamDAO {
exam.quitPassword, exam.quitPassword,
null, // browser keys null, // browser keys
(exam.status != null) ? exam.status.name() : null, (exam.status != null) ? exam.status.name() : null,
BooleanUtils.toIntegerObject(exam.lmsSebRestriction),
null, // updating null, // updating
null, // lastUpdate null, // lastUpdate
null // active null // active
@ -212,6 +213,7 @@ public class ExamDAOImpl implements ExamDAO {
null, // quitPassword null, // quitPassword
null, // browser keys null, // browser keys
null, // status null, // status
null, // lmsSebRestriction
null, // updating null, // updating
null, // lastUpdate null, // lastUpdate
BooleanUtils.toIntegerObject(exam.active)); BooleanUtils.toIntegerObject(exam.active));
@ -233,6 +235,7 @@ public class ExamDAOImpl implements ExamDAO {
null, // quitPassword null, // quitPassword
null, // browser keys null, // browser keys
(exam.status != null) ? exam.status.name() : ExamStatus.UP_COMING.name(), (exam.status != null) ? exam.status.name() : ExamStatus.UP_COMING.name(),
BooleanUtils.toInteger(exam.lmsSebRestriction),
BooleanUtils.toInteger(false), BooleanUtils.toInteger(false),
null, // lastUpdate null, // lastUpdate
BooleanUtils.toInteger(true)); BooleanUtils.toInteger(true));
@ -251,7 +254,7 @@ public class ExamDAOImpl implements ExamDAO {
final List<Long> ids = extractListOfPKs(all); final List<Long> ids = extractListOfPKs(all);
final ExamRecord examRecord = new ExamRecord(null, null, null, null, null, final ExamRecord examRecord = new ExamRecord(null, null, null, null, null,
null, null, null, null, null, null, null, BooleanUtils.toInteger(active)); null, null, null, null, null, null, null, null, BooleanUtils.toInteger(active));
this.examRecordMapper.updateByExampleSelective(examRecord) this.examRecordMapper.updateByExampleSelective(examRecord)
.where(ExamRecordDynamicSqlSupport.id, isIn(ids)) .where(ExamRecordDynamicSqlSupport.id, isIn(ids))
@ -345,7 +348,7 @@ public class ExamDAOImpl implements ExamDAO {
final ExamRecord newRecord = new ExamRecord( final ExamRecord newRecord = new ExamRecord(
examId, examId,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
BooleanUtils.toInteger(true), BooleanUtils.toInteger(true),
update, update,
null); null);
@ -375,7 +378,7 @@ public class ExamDAOImpl implements ExamDAO {
final ExamRecord newRecord = new ExamRecord( final ExamRecord newRecord = new ExamRecord(
examId, examId,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
BooleanUtils.toInteger(false), BooleanUtils.toInteger(false),
update, update,
null); null);
@ -389,7 +392,7 @@ public class ExamDAOImpl implements ExamDAO {
} }
@Override @Override
@Transactional @Transactional(propagation = Propagation.REQUIRES_NEW)
public Result<Long> forceUnlock(final Long examId) { public Result<Long> forceUnlock(final Long examId) {
log.info("forceUnlock for exam: {}", examId); log.info("forceUnlock for exam: {}", examId);
@ -397,7 +400,7 @@ public class ExamDAOImpl implements ExamDAO {
return Result.tryCatch(() -> { return Result.tryCatch(() -> {
final ExamRecord examRecord = new ExamRecord( final ExamRecord examRecord = new ExamRecord(
examId, examId,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
BooleanUtils.toInteger(false), BooleanUtils.toInteger(false),
null, null); null, null);
@ -616,7 +619,9 @@ public class ExamDAOImpl implements ExamDAO {
record.getOwner(), record.getOwner(),
supporter, supporter,
status, status,
BooleanUtils.toBooleanObject((quizData != null) ? record.getActive() : 0), BooleanUtils.toBooleanObject((quizData != null) ? record.getLmsSebRestriction() : null),
record.getBrowserKeys(),
BooleanUtils.toBooleanObject((quizData != null) ? record.getActive() : null),
record.getLastupdate()); record.getLastupdate());
}); });
} }

14
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPITemplate.java
View file

@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import ch.ethz.seb.sebserver.gbl.api.APIMessage; import ch.ethz.seb.sebserver.gbl.api.APIMessage;
import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.EntityType;
import ch.ethz.seb.sebserver.gbl.model.Domain.LMS_SETUP; import ch.ethz.seb.sebserver.gbl.model.Domain.LMS_SETUP;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam;
import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; import ch.ethz.seb.sebserver.gbl.model.exam.QuizData;
import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup;
import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetupTestResult; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetupTestResult;
@ -80,6 +81,19 @@ public interface LmsAPITemplate {
// examinee identifier received by on SEB-Client connection. // examinee identifier received by on SEB-Client connection.
//Result<ExamineeAccountDetails> getExamineeAccountDetails(String examineeUserId); //Result<ExamineeAccountDetails> getExamineeAccountDetails(String examineeUserId);
/** Applies a SEB Client restriction within the LMS with the given attributes.
*
* @param sebRestrictionData containing all data for SEB Client restriction
* @return Result refer to the given SebRestrictionData if restriction was successful or to an error if not */
Result<SebRestrictionData> applySebClientRestriction(SebRestrictionData sebRestrictionData);
/** Releases an already applied SEB Client restriction within the LMS for a given Exam.
* This completely removes the SEB Client restriction on LMS side.
*
* @param exam the Exam to release the restriction for
* @return Result refer to the given Exam if successful or to an error if not */
Result<Exam> releaseSebClientRestriction(Exam exam);
default List<APIMessage> attributeValidation(final ClientCredentials credentials) { default List<APIMessage> attributeValidation(final ClientCredentials credentials) {
final LmsSetup lmsSetup = lmsSetup(); final LmsSetup lmsSetup = lmsSetup();

69
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/SebRestrictionData.java Normal file
View file

@ -0,0 +1,69 @@
/*
* 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.lms;
import java.util.Collection;
import java.util.Map;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam;
import ch.ethz.seb.sebserver.gbl.util.Utils;
public final class SebRestrictionData {
public final Exam exam;
public final Collection<String> configKeys;
public final Collection<String> browserExamKeys;
public final Map<String, String> additionalAttributes;
public SebRestrictionData(
final Exam exam,
final Collection<String> configKeys,
final Collection<String> browserExamKeys,
final Map<String, String> additionalAttributes) {
this.exam = exam;
this.configKeys = Utils.immutableCollectionOf(configKeys);
this.browserExamKeys = Utils.immutableCollectionOf(browserExamKeys);
this.additionalAttributes = Utils.immutableMapOf(additionalAttributes);
}
public Exam getExam() {
return this.exam;
}
public Collection<String> getConfigKeys() {
return this.configKeys;
}
public Collection<String> getBrowserExamKeys() {
return this.browserExamKeys;
}
public Map<String, String> getAdditionalAttributes() {
return this.additionalAttributes;
}
@Override
public String toString() {
final StringBuilder builder = new StringBuilder();
builder.append("SebRestrictionData [exam=");
builder.append(this.exam);
builder.append(", configKeys=");
builder.append(this.configKeys);
builder.append(", browserExamKeys=");
builder.append(this.browserExamKeys);
builder.append(", additionalAttributes=");
builder.append(this.additionalAttributes);
builder.append("]");
return builder.toString();
}
}

14
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/MockupLmsAPITemplate.java
View file

@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.api.APIMessage; import ch.ethz.seb.sebserver.gbl.api.APIMessage;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam;
import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; import ch.ethz.seb.sebserver.gbl.model.exam.QuizData;
import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup;
import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType;
@ -32,6 +33,7 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentials;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPIService; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPIService;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPITemplate; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPITemplate;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.SebRestrictionData;
final class MockupLmsAPITemplate implements LmsAPITemplate { final class MockupLmsAPITemplate implements LmsAPITemplate {
@ -141,6 +143,18 @@ final class MockupLmsAPITemplate implements LmsAPITemplate {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@Override
public Result<SebRestrictionData> applySebClientRestriction(final SebRestrictionData sebRestrictionData) {
log.info("Apply SEB Client restriction: {}", sebRestrictionData);
return Result.of(sebRestrictionData);
}
@Override
public Result<Exam> releaseSebClientRestriction(final Exam exam) {
log.info("Release SEB Client restriction for Exam: {}", exam);
return Result.of(exam);
}
private QuizData getExternalAddressAlias(final QuizData quizData) { private QuizData getExternalAddressAlias(final QuizData quizData) {
final String externalAddressAlias = this.webserviceInfo.getExternalAddressAlias("lms.mockup.com"); final String externalAddressAlias = this.webserviceInfo.getExternalAddressAlias("lms.mockup.com");
if (StringUtils.isNoneBlank(externalAddressAlias)) { if (StringUtils.isNoneBlank(externalAddressAlias)) {

34
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/OpenEdxLmsAPITemplate.java
View file

@ -56,6 +56,7 @@ import ch.ethz.seb.sebserver.gbl.api.ProxyData;
import ch.ethz.seb.sebserver.gbl.api.ProxyData.ProxyAuthType; import ch.ethz.seb.sebserver.gbl.api.ProxyData.ProxyAuthType;
import ch.ethz.seb.sebserver.gbl.async.AsyncService; import ch.ethz.seb.sebserver.gbl.async.AsyncService;
import ch.ethz.seb.sebserver.gbl.async.MemoizingCircuitBreaker; import ch.ethz.seb.sebserver.gbl.async.MemoizingCircuitBreaker;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam;
import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; import ch.ethz.seb.sebserver.gbl.model.exam.QuizData;
import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup;
import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetupTestResult; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetupTestResult;
@ -66,6 +67,7 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentials;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPIService; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPIService;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPITemplate; import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPITemplate;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.SebRestrictionData;
/** Implements the LmsAPITemplate for Open edX LMS Course API access. /** Implements the LmsAPITemplate for Open edX LMS Course API access.
* *
@ -77,6 +79,8 @@ final class OpenEdxLmsAPITemplate implements LmsAPITemplate {
private static final String OPEN_EDX_DEFAULT_TOKEN_REQUEST_PATH = "/oauth2/access_token"; private static final String OPEN_EDX_DEFAULT_TOKEN_REQUEST_PATH = "/oauth2/access_token";
private static final String OPEN_EDX_DEFAULT_COURSE_ENDPOINT = "/api/courses/v1/courses/"; private static final String OPEN_EDX_DEFAULT_COURSE_ENDPOINT = "/api/courses/v1/courses/";
private static final String OPEN_EDX_DEFAULT_COURSE_START_URL_PREFIX = "/courses/"; private static final String OPEN_EDX_DEFAULT_COURSE_START_URL_PREFIX = "/courses/";
private static final String OPEN_EDX_DEFAULT_COURSE_RESTRICTION_API_PATH =
"/seb-openedx/api/v1/course/%s/configuration/";
private final LmsSetup lmsSetup; private final LmsSetup lmsSetup;
private final ClientCredentials credentials; private final ClientCredentials credentials;
@ -173,6 +177,34 @@ final class OpenEdxLmsAPITemplate implements LmsAPITemplate {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@Override
public Result<SebRestrictionData> applySebClientRestriction(final SebRestrictionData sebRestrictionData) {
return Result.tryCatch(() -> {
if (log.isDebugEnabled()) {
log.debug("Apply SEB Client restriction: {}", sebRestrictionData);
}
// TODO
return sebRestrictionData;
});
}
@Override
public Result<Exam> releaseSebClientRestriction(final Exam exam) {
return Result.tryCatch(() -> {
if (log.isDebugEnabled()) {
log.debug("Release SEB Client restriction for Exam: {}", exam);
}
// TODO
return exam;
});
}
private Result<LmsSetup> initRestTemplateAndRequestAccessToken() { private Result<LmsSetup> initRestTemplateAndRequestAccessToken() {
return Result.tryCatch(() -> { return Result.tryCatch(() -> {
@ -298,7 +330,7 @@ final class OpenEdxLmsAPITemplate implements LmsAPITemplate {
try { try {
final URL url = new URL(lmsSetup.lmsApiUrl); final URL url = new URL(lmsSetup.lmsApiUrl);
final int port = url.getPort(); final int port = url.getPort();
_externalStartURI = this.webserviceInfo.getHttpScheme() + _externalStartURI = url.getProtocol() +
Constants.URL_ADDRESS_SEPARATOR + externalAddressAlias + Constants.URL_ADDRESS_SEPARATOR + externalAddressAlias +
((port >= 0) ((port >= 0)
? Constants.URL_PORT_SEPARATOR + port ? Constants.URL_PORT_SEPARATOR + port

80
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/OpenEdxSebClientRestriction.java Normal file
View file

@ -0,0 +1,80 @@
/*
* 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.lms.impl;
import java.util.Collection;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import ch.ethz.seb.sebserver.gbl.util.Utils;
@JsonIgnoreProperties(ignoreUnknown = true)
public class OpenEdxSebClientRestriction {
@JsonProperty("CONFIG_KEYS")
public final Collection<String> configKeys;
@JsonProperty("BROWSER_KEYS")
public final Collection<String> browserExamKeys;
@JsonProperty("WHITELIST_PATHS")
public final Collection<String> whiteListPaths;
@JsonProperty("BLACKLIST_CHAPTERS")
public final Collection<String> blacklistChapters;
@JsonProperty("SEB_PERMISSION_COMPONENTS")
public final Collection<String> permissionComponents;
@JsonProperty("USER_BANNING_ENABLED")
public final boolean banningEnabled;
@JsonCreator
protected OpenEdxSebClientRestriction(
@JsonProperty("CONFIG_KEYS") final Collection<String> configKeys,
@JsonProperty("BROWSER_KEYS") final Collection<String> browserExamKeys,
@JsonProperty("WHITELIST_PATHS") final Collection<String> whiteListPaths,
@JsonProperty("BLACKLIST_CHAPTERS") final Collection<String> blacklistChapters,
@JsonProperty("SEB_PERMISSION_COMPONENTS") final Collection<String> permissionComponents,
@JsonProperty("USER_BANNING_ENABLED") final boolean banningEnabled) {
this.configKeys = Utils.immutableCollectionOf(configKeys);
this.browserExamKeys = Utils.immutableCollectionOf(browserExamKeys);
this.whiteListPaths = Utils.immutableCollectionOf(whiteListPaths);
this.blacklistChapters = Utils.immutableCollectionOf(blacklistChapters);
this.permissionComponents = Utils.immutableCollectionOf(permissionComponents);
this.banningEnabled = banningEnabled;
}
public Collection<String> getConfigKeys() {
return this.configKeys;
}
public Collection<String> getBrowserExamKeys() {
return this.browserExamKeys;
}
public Collection<String> getWhiteListPaths() {
return this.whiteListPaths;
}
public Collection<String> getBlacklistChapters() {
return this.blacklistChapters;
}
public Collection<String> getPermissionComponents() {
return this.permissionComponents;
}
public boolean isBanningEnabled() {
return this.banningEnabled;
}
}

13
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/SebExamConfigService.java
View file

@ -10,6 +10,7 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Collection;
import ch.ethz.seb.sebserver.gbl.api.APIMessage.FieldValidationException; import ch.ethz.seb.sebserver.gbl.api.APIMessage.FieldValidationException;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration; import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration;
@ -88,7 +89,7 @@ public interface SebExamConfigService {
* @return The configuration node identifier (PK) */ * @return The configuration node identifier (PK) */
Long exportForExam(OutputStream out, Long institutionId, Long examId, Long configurationNodeId); Long exportForExam(OutputStream out, Long institutionId, Long examId, Long configurationNodeId);
/** Generates a Config-Key form the SEB exam configuration defined by configurationNodeId. /** Generates a Config-Key from the SEB exam configuration defined by configurationNodeId.
* See https://www.safeexambrowser.org/developer/seb-config-key.html for more information about the Config-Key * See https://www.safeexambrowser.org/developer/seb-config-key.html for more information about the Config-Key
* *
* @param institutionId the institutional id * @param institutionId the institutional id
@ -96,6 +97,16 @@ public interface SebExamConfigService {
* @return Result refer to the generated Config-Key or to an error if happened. */ * @return Result refer to the generated Config-Key or to an error if happened. */
Result<String> generateConfigKey(Long institutionId, Long configurationNodeId); Result<String> generateConfigKey(Long institutionId, Long configurationNodeId);
/** Generates a list of Config-Key from a given Exam by collecting all the SEB Exam Configurations that are attached
* to this Exam
* See https://www.safeexambrowser.org/developer/seb-config-key.html for more information about the Config-Key
*
* @param institutionId the institutional id
* @param examId the Exam identifier
* @return Result refer to a list of generated Config-Key for all configurations of the exam or to an error if
* happened. */
Result<Collection<String>> generateConfigKeys(Long institutionId, Long examId);
/** Imports a SEB Exam Configuration from a SEB File of the format: /** Imports a SEB Exam Configuration from a SEB File of the format:
* https://www.safeexambrowser.org/developer/seb-file-format.html * https://www.safeexambrowser.org/developer/seb-file-format.html
* *

6
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/SebClientConfigServiceImpl.java
View file

@ -238,7 +238,7 @@ public class SebClientConfigServiceImpl implements SebClientConfigService {
? " <key>startURL</key>\r\n" + ? " <key>startURL</key>\r\n" +
" <string>" + config.fallbackStartURL + "</string>\r\n" " <string>" + config.fallbackStartURL + "</string>\r\n"
: "", : "",
this.webserviceInfo.getServerURL(), this.webserviceInfo.getExternalServerURL(),
String.valueOf(config.institutionId), String.valueOf(config.institutionId),
plainClientId, plainClientId,
plainClientSecret, plainClientSecret,
@ -307,8 +307,8 @@ public class SebClientConfigServiceImpl implements SebClientConfigService {
* *
* @param clientId the clientId/clientName * @param clientId the clientId/clientName
* @return encoded clientSecret for that SebClientConfiguration with clientId or null of not existing */ * @return encoded clientSecret for that SebClientConfiguration with clientId or null of not existing */
private Result<CharSequence> getEncodedClientConfigSecret(final String clientCongifId) { private Result<CharSequence> getEncodedClientConfigSecret(final String clientId) {
return this.sebClientConfigDAO.getConfigPasswortCipherByClientName(clientCongifId) return this.sebClientConfigDAO.getConfigPasswortCipherByClientName(clientId)
.map(cipher -> this.clientPasswordEncoder.encode(this.clientCredentialService.decrypt(cipher))); .map(cipher -> this.clientPasswordEncoder.encode(this.clientCredentialService.decrypt(cipher)));
} }

10
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/SebExamConfigServiceImpl.java
View file

@ -318,6 +318,16 @@ public class SebExamConfigServiceImpl implements SebExamConfigService {
} }
} }
@Override
public Result<Collection<String>> generateConfigKeys(final Long institutionId, final Long examId) {
return this.examConfigurationMapDAO.getConfigurationNodeIds(examId)
.map(ids -> ids
.stream()
.map(id -> generateConfigKey(institutionId, id)
.getOrThrow())
.collect(Collectors.toList()));
}
@Override @Override
public Result<Configuration> importFromSEBFile( public Result<Configuration> importFromSEBFile(
final Long configNodeId, final Long configNodeId,

105
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ExamConfigUpdateService.java
View file

@ -10,40 +10,99 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session;
import java.util.Collection; import java.util.Collection;
import org.slf4j.Logger; import ch.ethz.seb.sebserver.gbl.model.exam.Exam;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.annotation.Transactional;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
public interface ExamConfigUpdateService { public interface ExamConfigUpdateService {
Logger log = LoggerFactory.getLogger(ExamConfigUpdateService.class); /** Used to process a SEB Exam Configuration change that can also effect some
* running exams that as the specified configuration attached.
*
* This deals with the whole functionality the underling data-structure provides. So
* it assumes a N to M relationship between a SEB Exam Configuration and an Exam even
* if this may currently not be possible in case of implemented restrictions.
*
* First of all a consistency check is applied that checks if there is no running Exam
* involved that has currently active SEB Client connection. Active SEB Client connections are
* established connections that are not yet closed and connection attempts that are older the a
* defined time interval.
*
* After this check passed, the system places an update-lock on each Exam that is involved on the
* data-base level and commit this immediately so that this can prevent new SEB Client connection
* attempts to be allowed.
*
* After placing update-locks the fist check is done again to ensure there where no new SEB Client
* connection attempts in the meantime. If there where, the procedure will stop and rollback all
* changes so far.
*
* If everything is locked the changes to the SEB Exam Configuration will be saved to the data-base
* and all involved caches will be flushed to ensure the changed will take effect on next request.
*
* The last step is to update the SEB restriction on the LMS for every involved exam if it is running
* and the feature is switched on. If something goes wrong during the update for an exam here, no
* rollback of the entire procedure is applied. Instead the error is logged and the update can be
* later triggered manually by an administrator.
*
* If there is any other error during the procedure the changes are rolled back and a force release of
* the update-locks is applied to ensure all involved Exams are not locked anymore.
*
* @param configurationNodeId the SEB Configuration node identifier
* @return Result refer to a list of involved and updated Exam identifiers */
Result<Collection<Long>> processSEBExamConfigurationChange(Long configurationNodeId); Result<Collection<Long>> processSEBExamConfigurationChange(Long configurationNodeId);
@Transactional Result<Long> processSEBExamConfigurationAttachmentChange(Long examId);
default Result<Configuration> processSEBExamConfigurationChange(final Configuration config) {
if (config == null) {
return Result.ofError(new NullPointerException("Configuration has null reference"));
}
return Result.tryCatch(() -> {
processSEBExamConfigurationChange(config.configurationNodeId)
.map(ids -> {
log.info("Successfully updated SEB Configuration for exams: {}", ids);
return ids;
})
.getOrThrow();
return config;
});
}
/** Use this to force a release of update-locks for all Exams that has the specified
* SEB Exam Configuration attached.
*
* @param configurationId The configuration that belongs to the affected SEB Exam configuration node */
void forceReleaseUpdateLocks(Long configurationId); void forceReleaseUpdateLocks(Long configurationId);
/** Use this to force a release of update-locks for all Exams that has the specified
* SEB Exam Configuration attached.
*
* @param examIds list of Exam identifiers to apply the force release to */
Collection<Result<Long>> forceReleaseUpdateLocks(Collection<Long> examIds); Collection<Result<Long>> forceReleaseUpdateLocks(Collection<Long> examIds);
/** Use this to check if for a specified SEB Exam configuration no running Exam
* is involved that has currently active SEB Client connections. And get a list
* of identifiers of all involved Exams that are affected by a change of the given configuration.
*
* Active SEB Client connections are established connections that are not yet closed and connection
* attempts that are older the a defined time interval.
*
* @param configurationNodeId the identifier of the SEB Exam configuration
* @return Result refer to a list of identifiers of involved Exams or refer to an error on integrity violation or
* processing error */
Result<Collection<Long>> checkRunningExamIntegrity(final Long configurationNodeId); Result<Collection<Long>> checkRunningExamIntegrity(final Long configurationNodeId);
/** Use this to check if a specified Exam has currently active SEB Client connections.
*
* Active SEB Client connections are established connections that are not yet closed and
* connection attempts that are older the a defined time interval.
*
* @param examId The Exam identifier
* @return true if the given Exam has currently no active client connection, false otherwise. */
boolean hasActiveSebClientConnections(final Long examId);
/** Used to apply SEB Client restriction within the LMS API for a specified Exam, if
* the exam has activated the SEB Client restriction
*
* @param exam the Exam instance
* @return Result refer to the Exam instance or to an error if happened */
Result<Exam> applySebClientRestriction(Exam exam);
/** Used to update SEB Client restriction within the LMS API for a specified Exam, if
* the exam has activated the SEB Client restriction and the Exam is already running.
*
* @param exam the Exam instance
* @return Result refer to the Exam instance or to an error if happened */
Result<Exam> updateSebClientRestriction(Exam exam);
/** Used to release SEB Client restriction within the LMS API for a specified Exam.
*
* @param exam the Exam instance
* @return Result refer to the Exam instance or to an error if happened */
Result<Exam> releaseSebClientRestriction(Exam exam);
} }

6
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/ExamSessionService.java
View file

@ -38,6 +38,12 @@ public interface ExamSessionService {
* okay. */ * okay. */
Result<Collection<APIMessage>> checkRunningExamConsystency(Long examId); Result<Collection<APIMessage>> checkRunningExamConsystency(Long examId);
/** Checks if a specified Exam has at least a default SEB Exam configuration attached.
*
* @param examId the identifier if the Exam to check
* @return true if there is a default SEB Exam Configuration attached or false if not */
boolean hasDefaultConfigurationAttached(final Long examId);
/** Indicates whether an Exam is currently running or not. /** Indicates whether an Exam is currently running or not.
* *
* @param examId the PK of the Exam to test * @param examId the PK of the Exam to test

11
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/PingHandlingStrategy.java
View file

@ -8,10 +8,21 @@
package ch.ethz.seb.sebserver.webservice.servicelayer.session; package ch.ethz.seb.sebserver.webservice.servicelayer.session;
/** Defines a SEB Client connection ping handling strategy.
* The strategy may be different in case of stand-alone or distributed SEB Server setup. */
public interface PingHandlingStrategy { public interface PingHandlingStrategy {
/** Initializes the ping handling for a new SEB Connection.
*
* @param connectionId the SEB Connection identifier
* @param connectionToken the SEB Connection token */
void initForConnection(Long connectionId, String connectionToken); void initForConnection(Long connectionId, String connectionToken);
/** Used to notify a ping from a SEB Client connection.
*
* @param connectionToken the SEB Client connection token
* @param timestamp the ping time-stamp
* @param pingNumber the ping number */
void notifyPing(final String connectionToken, final long timestamp, final int pingNumber); void notifyPing(final String connectionToken, final long timestamp, final int pingNumber);
} }

83
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamConfigUpdateServiceImpl.java
View file

@ -10,6 +10,7 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.session.impl;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -22,6 +23,7 @@ import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.api.APIMessage; import ch.ethz.seb.sebserver.gbl.api.APIMessage;
import ch.ethz.seb.sebserver.gbl.api.APIMessage.ErrorMessage; import ch.ethz.seb.sebserver.gbl.api.APIMessage.ErrorMessage;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Exam;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration; import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration;
import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection.ConnectionStatus;
import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData; import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData;
@ -46,20 +48,20 @@ public class ExamConfigUpdateServiceImpl implements ExamConfigUpdateService {
private final ConfigurationDAO configurationDAO; private final ConfigurationDAO configurationDAO;
private final ExamConfigurationMapDAO examConfigurationMapDAO; private final ExamConfigurationMapDAO examConfigurationMapDAO;
private final ExamSessionService examSessionService; private final ExamSessionService examSessionService;
private final ExamSessionControlTask examSessionControlTask; private final ExamUpdateHandler examUpdateHandler;
protected ExamConfigUpdateServiceImpl( protected ExamConfigUpdateServiceImpl(
final ExamDAO examDAO, final ExamDAO examDAO,
final ConfigurationDAO configurationDAO, final ConfigurationDAO configurationDAO,
final ExamConfigurationMapDAO examConfigurationMapDAO, final ExamConfigurationMapDAO examConfigurationMapDAO,
final ExamSessionService examSessionService, final ExamSessionService examSessionService,
final ExamSessionControlTask examSessionControlTask) { final ExamUpdateHandler examUpdateHandler) {
this.examDAO = examDAO; this.examDAO = examDAO;
this.configurationDAO = configurationDAO; this.configurationDAO = configurationDAO;
this.examConfigurationMapDAO = examConfigurationMapDAO; this.examConfigurationMapDAO = examConfigurationMapDAO;
this.examSessionService = examSessionService; this.examSessionService = examSessionService;
this.examSessionControlTask = examSessionControlTask; this.examUpdateHandler = examUpdateHandler;
} }
// processing: // processing:
@ -73,7 +75,7 @@ public class ExamConfigUpdateServiceImpl implements ExamConfigUpdateService {
@Transactional @Transactional
public Result<Collection<Long>> processSEBExamConfigurationChange(final Long configurationNodeId) { public Result<Collection<Long>> processSEBExamConfigurationChange(final Long configurationNodeId) {
final String updateId = this.examSessionControlTask.createUpdateId(); final String updateId = this.examUpdateHandler.createUpdateId();
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Process SEB Exam Configuration update for: {} with update-id {}", log.debug("Process SEB Exam Configuration update for: {} with update-id {}",
@ -128,9 +130,10 @@ public class ExamConfigUpdateServiceImpl implements ExamConfigUpdateService {
} }
// generate the new Config Key and update the Config Key within the LMSSetup API for each exam (delete old Key and add new Key) // generate the new Config Key and update the Config Key within the LMSSetup API for each exam (delete old Key and add new Key)
final Collection<Long> updatedExams = updateConfigKey(exams) final Collection<Long> updatedExams = updateLmsSebRestriction(exams)
.stream() .stream()
.map(Result::getOrThrow) .map(Result::get)
.filter(Objects::nonNull)
.map(Exam::getId) .map(Exam::getId)
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -166,6 +169,24 @@ public class ExamConfigUpdateServiceImpl implements ExamConfigUpdateService {
.onError(TransactionHandler::rollback); .onError(TransactionHandler::rollback);
} }
@Override
public Result<Long> processSEBExamConfigurationAttachmentChange(final Long examId) {
return this.examDAO.byPK(examId)
.map(exam -> {
if (exam.status != ExamStatus.RUNNING) {
return examId;
}
// TODO Lock??
// TODO flush cache
// TODO update seb restriction if on
// TODO unlock?
return examId;
});
}
@Override @Override
public void forceReleaseUpdateLocks(final Long configurationId) { public void forceReleaseUpdateLocks(final Long configurationId) {
@ -200,6 +221,24 @@ public class ExamConfigUpdateServiceImpl implements ExamConfigUpdateService {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@Override
public Result<Exam> applySebClientRestriction(final Exam exam) {
return this.examUpdateHandler.applySebClientRestriction(exam)
.onError(error -> log.error("Failed to apply SEB Client restriction for Exam: {}", exam, error));
}
@Override
public Result<Exam> updateSebClientRestriction(final Exam exam) {
return this.examUpdateHandler.updateSebClientRestriction(exam)
.onError(error -> log.error("Failed to update SEB Client restriction for Exam: {}", exam, error));
}
@Override
public Result<Exam> releaseSebClientRestriction(final Exam exam) {
return this.examUpdateHandler.releaseSebClientRestriction(exam)
.onError(error -> log.error("Failed to release SEB Client restriction for Exam: {}", exam, error));
}
private void checkIntegrityDoubleCheck( private void checkIntegrityDoubleCheck(
final Collection<Long> examIdsFirstCheck, final Collection<Long> examIdsFirstCheck,
final Collection<Long> examIdsSecondCheck) { final Collection<Long> examIdsSecondCheck) {
@ -222,26 +261,14 @@ public class ExamConfigUpdateServiceImpl implements ExamConfigUpdateService {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
private Collection<Result<Exam>> updateConfigKey(final Collection<Exam> exams) { private Collection<Result<Exam>> updateLmsSebRestriction(final Collection<Exam> exams) {
return exams return exams
.stream() .stream()
.map(this::updateConfigKey) .filter(exam -> exam.getStatus() == ExamStatus.RUNNING)
.map(this::updateSebClientRestriction)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
private Result<Exam> updateConfigKey(final Exam exam) {
return Result.tryCatch(() -> {
if (log.isDebugEnabled()) {
log.debug("update Config Key for Exam {}", exam.externalId);
}
// TODO
return exam;
});
}
private Collection<Result<Exam>> evictFromCache(final Collection<Exam> exams) { private Collection<Result<Exam>> evictFromCache(final Collection<Exam> exams) {
return exams return exams
.stream() .stream()
@ -282,6 +309,20 @@ public class ExamConfigUpdateServiceImpl implements ExamConfigUpdateService {
} }
} }
@Override
public boolean hasActiveSebClientConnections(final Long examId) {
if (examId == null || !this.examSessionService.isExamRunning(examId)) {
return false;
}
return this.examSessionService.getConnectionData(examId)
.getOrThrow()
.stream()
.filter(ExamConfigUpdateServiceImpl::isActiveConnection)
.findFirst()
.isPresent();
}
private static boolean isActiveConnection(final ClientConnectionData connection) { private static boolean isActiveConnection(final ClientConnectionData connection) {
if (connection.clientConnection.status == ConnectionStatus.ESTABLISHED if (connection.clientConnection.status == ConnectionStatus.ESTABLISHED
|| connection.clientConnection.status == ConnectionStatus.AUTHENTICATED) { || connection.clientConnection.status == ConnectionStatus.AUTHENTICATED) {

10
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionCacheService.java
View file

@ -52,26 +52,26 @@ public class ExamSessionCacheService {
private static final Logger log = LoggerFactory.getLogger(ExamSessionCacheService.class); private static final Logger log = LoggerFactory.getLogger(ExamSessionCacheService.class);
private final ExamDAO examDAO; private final ExamDAO examDAO;
private final ExamSessionControlTask examControlTask;
private final ClientConnectionDAO clientConnectionDAO; private final ClientConnectionDAO clientConnectionDAO;
private final ClientIndicatorFactory clientIndicatorFactory; private final ClientIndicatorFactory clientIndicatorFactory;
private final SebExamConfigService sebExamConfigService; private final SebExamConfigService sebExamConfigService;
private final ClientEventRecordMapper clientEventRecordMapper; private final ClientEventRecordMapper clientEventRecordMapper;
private final ExamUpdateHandler examUpdateHandler;
protected ExamSessionCacheService( protected ExamSessionCacheService(
final ExamDAO examDAO, final ExamDAO examDAO,
final ExamSessionControlTask examControlTask,
final ClientConnectionDAO clientConnectionDAO, final ClientConnectionDAO clientConnectionDAO,
final ClientIndicatorFactory clientIndicatorFactory, final ClientIndicatorFactory clientIndicatorFactory,
final SebExamConfigService sebExamConfigService, final SebExamConfigService sebExamConfigService,
final ClientEventRecordMapper clientEventRecordMapper) { final ClientEventRecordMapper clientEventRecordMapper,
final ExamUpdateHandler examUpdateHandler) {
this.examDAO = examDAO; this.examDAO = examDAO;
this.examControlTask = examControlTask;
this.clientConnectionDAO = clientConnectionDAO; this.clientConnectionDAO = clientConnectionDAO;
this.clientIndicatorFactory = clientIndicatorFactory; this.clientIndicatorFactory = clientIndicatorFactory;
this.sebExamConfigService = sebExamConfigService; this.sebExamConfigService = sebExamConfigService;
this.clientEventRecordMapper = clientEventRecordMapper; this.clientEventRecordMapper = clientEventRecordMapper;
this.examUpdateHandler = examUpdateHandler;
} }
@Cacheable( @Cacheable(
@ -123,7 +123,7 @@ public class ExamSessionCacheService {
return true; return true;
} }
case UP_COMING: { case UP_COMING: {
return this.examControlTask.updateRunning(exam.id) return this.examUpdateHandler.updateRunning(exam.id)
.map(e -> e.status == ExamStatus.RUNNING) .map(e -> e.status == ExamStatus.RUNNING)
.getOr(false); .getOr(false);
} }

64
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionControlTask.java
View file

@ -22,10 +22,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam; import ch.ethz.seb.sebserver.gbl.model.exam.Exam;
import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus;
import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.webservice.WebserviceInfo;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO;
@Service @Service
@ -34,21 +30,21 @@ class ExamSessionControlTask {
private static final Logger log = LoggerFactory.getLogger(ExamSessionControlTask.class); private static final Logger log = LoggerFactory.getLogger(ExamSessionControlTask.class);
private final ExamDAO examDAO; private final ExamDAO examDAO;
private final ExamUpdateHandler examUpdateHandler;
private final Long examTimePrefix; private final Long examTimePrefix;
private final Long examTimeSuffix; private final Long examTimeSuffix;
private final String updatePrefix;
protected ExamSessionControlTask( protected ExamSessionControlTask(
final ExamDAO examDAO, final ExamDAO examDAO,
final WebserviceInfo webserviceInfo, final ExamUpdateHandler examUpdateHandler,
@Value("${sebserver.webservice.api.exam.time-prefix:3600000}") final Long examTimePrefix, @Value("${sebserver.webservice.api.exam.time-prefix:3600000}") final Long examTimePrefix,
@Value("${sebserver.webservice.api.exam.time-suffix:3600000}") final Long examTimeSuffix) { @Value("${sebserver.webservice.api.exam.time-suffix:3600000}") final Long examTimeSuffix) {
this.examDAO = examDAO; this.examDAO = examDAO;
this.examUpdateHandler = examUpdateHandler;
this.examTimePrefix = examTimePrefix; this.examTimePrefix = examTimePrefix;
this.examTimeSuffix = examTimeSuffix; this.examTimeSuffix = examTimeSuffix;
this.updatePrefix = webserviceInfo.getHostAddress()
+ "_" + webserviceInfo.getServerPort() + "_";
} }
@Async @Async
@ -56,14 +52,13 @@ class ExamSessionControlTask {
@Transactional @Transactional
public void execTask() { public void execTask() {
final String updateId = this.createUpdateId(); final String updateId = this.examUpdateHandler.createUpdateId();
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Run exam runtime update task with Id: {}", updateId); log.debug("Run exam runtime update task with Id: {}", updateId);
} }
controlStart(updateId); controlStart(updateId);
controlEnd(updateId); controlEnd(updateId);
} }
@ -80,7 +75,7 @@ class ExamSessionControlTask {
.getOrThrow() .getOrThrow()
.stream() .stream()
.filter(exam -> exam.startTime.minus(this.examTimePrefix).isBefore(now)) .filter(exam -> exam.startTime.minus(this.examTimePrefix).isBefore(now))
.map(exam -> this.setRunning(exam, updateId)) .map(exam -> this.examUpdateHandler.setRunning(exam, updateId))
.collect(Collectors.toMap(Exam::getId, Exam::getName)); .collect(Collectors.toMap(Exam::getId, Exam::getName));
if (!updated.isEmpty()) { if (!updated.isEmpty()) {
@ -92,37 +87,6 @@ class ExamSessionControlTask {
} }
} }
public Result<Exam> updateRunning(final Long examId) {
return this.examDAO.byPK(examId)
.map(exam -> {
final DateTime now = DateTime.now(DateTimeZone.UTC);
if (exam.getStatus() == ExamStatus.UP_COMING
&& exam.endTime.plus(this.examTimeSuffix).isBefore(now)) {
return setRunning(exam, this.createUpdateId());
} else {
return exam;
}
});
}
public String createUpdateId() {
return this.updatePrefix + Utils.getMillisecondsNow();
}
private Exam setRunning(final Exam exam, final String updateId) {
if (log.isDebugEnabled()) {
log.debug("Update exam as running: {}", exam);
}
return this.examDAO
.placeLock(exam.id, updateId)
.flatMap(e -> this.examDAO.save(new Exam(
exam.id,
ExamStatus.RUNNING)))
.flatMap(e -> this.examDAO.releaseLock(e.id, updateId))
.getOrThrow();
}
private void controlEnd(final String updateId) { private void controlEnd(final String updateId) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Check ending exams: {}", updateId); log.debug("Check ending exams: {}", updateId);
@ -136,7 +100,7 @@ class ExamSessionControlTask {
.getOrThrow() .getOrThrow()
.stream() .stream()
.filter(exam -> exam.endTime.plus(this.examTimeSuffix).isBefore(now)) .filter(exam -> exam.endTime.plus(this.examTimeSuffix).isBefore(now))
.map(exam -> this.setFinished(exam, updateId)) .map(exam -> this.examUpdateHandler.setFinished(exam, updateId))
.collect(Collectors.toMap(Exam::getId, Exam::getName)); .collect(Collectors.toMap(Exam::getId, Exam::getName));
if (!updated.isEmpty()) { if (!updated.isEmpty()) {
@ -148,18 +112,4 @@ class ExamSessionControlTask {
} }
} }
private Exam setFinished(final Exam exam, final String updateId) {
if (log.isDebugEnabled()) {
log.debug("Update exam as finished: {}", exam);
}
return this.examDAO
.placeLock(exam.id, updateId)
.flatMap(e -> this.examDAO.save(new Exam(
exam.id,
ExamStatus.FINISHED)))
.flatMap(e -> this.examDAO.releaseLock(e.id, updateId))
.getOrThrow();
}
} }

8
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java
View file

@ -69,6 +69,7 @@ public class ExamSessionServiceImpl implements ExamSessionService {
this.clientConnectionDAO = clientConnectionDAO; this.clientConnectionDAO = clientConnectionDAO;
this.cacheManager = cacheManager; this.cacheManager = cacheManager;
this.indicatorDAO = indicatorDAO; this.indicatorDAO = indicatorDAO;
} }
@Override @Override
@ -110,6 +111,13 @@ public class ExamSessionServiceImpl implements ExamSessionService {
}); });
} }
@Override
public boolean hasDefaultConfigurationAttached(final Long examId) {
return !this.examConfigurationMapDAO
.getDefaultConfigurationNode(examId)
.hasError();
}
@Override @Override
public boolean isExamRunning(final Long examId) { public boolean isExamRunning(final Long examId) {
return !getRunningExam(examId).hasError(); return !getRunningExam(examId).hasError();

187
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamUpdateHandler.java Normal file
View file

@ -0,0 +1,187 @@
/*
* 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.session.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import ch.ethz.seb.sebserver.gbl.Constants;
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.profile.WebServiceProfile;
import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.webservice.WebserviceInfo;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.LmsAPIService;
import ch.ethz.seb.sebserver.webservice.servicelayer.lms.SebRestrictionData;
import ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig.SebExamConfigService;
@Lazy
@Service
@WebServiceProfile
class ExamUpdateHandler {
private static final Logger log = LoggerFactory.getLogger(ExamUpdateHandler.class);
private final ExamDAO examDAO;
private final SebExamConfigService sebExamConfigService;
private final LmsAPIService lmsAPIService;
private final String updatePrefix;
private final Long examTimeSuffix;
public ExamUpdateHandler(
final ExamDAO examDAO,
final SebExamConfigService sebExamConfigService,
final LmsAPIService lmsAPIService,
final WebserviceInfo webserviceInfo,
@Value("${sebserver.webservice.api.exam.time-suffix:3600000}") final Long examTimeSuffix) {
this.examDAO = examDAO;
this.sebExamConfigService = sebExamConfigService;
this.lmsAPIService = lmsAPIService;
this.updatePrefix = webserviceInfo.getHostAddress()
+ "_" + webserviceInfo.getServerPort() + "_";
this.examTimeSuffix = examTimeSuffix;
}
String createUpdateId() {
return this.updatePrefix + Utils.getMillisecondsNow();
}
Result<Exam> updateRunning(final Long examId) {
return this.examDAO.byPK(examId)
.map(exam -> {
final DateTime now = DateTime.now(DateTimeZone.UTC);
if (exam.getStatus() == ExamStatus.UP_COMING
&& exam.endTime.plus(this.examTimeSuffix).isBefore(now)) {
return setRunning(exam, this.createUpdateId());
} else {
return exam;
}
});
}
Exam setRunning(final Exam exam, final String updateId) {
if (log.isDebugEnabled()) {
log.debug("Update exam as running: {}", exam);
}
return this.examDAO
.placeLock(exam.id, updateId)
.flatMap(e -> this.examDAO.save(new Exam(
exam.id,
ExamStatus.RUNNING)))
.flatMap(this::applySebClientRestriction)
.flatMap(e -> this.examDAO.releaseLock(e.id, updateId))
.onError(error -> this.examDAO.forceUnlock(exam.id))
.getOrThrow();
}
Exam setFinished(final Exam exam, final String updateId) {
if (log.isDebugEnabled()) {
log.debug("Update exam as finished: {}", exam);
}
return this.examDAO
.placeLock(exam.id, updateId)
.flatMap(e -> this.examDAO.save(new Exam(
exam.id,
ExamStatus.FINISHED)))
.flatMap(this::releaseSebClientRestriction)
.flatMap(e -> this.examDAO.releaseLock(e.id, updateId))
.onError(error -> this.examDAO.forceUnlock(exam.id))
.getOrThrow();
}
Result<Exam> applySebClientRestriction(final Exam exam) {
if (!exam.lmsSebRestriction) {
if (log.isDebugEnabled()) {
log.debug("Skip SEB Client restrictions for exam: {}", exam);
}
return Result.of(exam);
}
if (log.isDebugEnabled()) {
log.debug("Apply SEB Client restrictions for exam: {}", exam);
}
return Result.tryCatch(() -> {
final Collection<String> configKeys = this.sebExamConfigService
.generateConfigKeys(exam.institutionId, exam.id)
.getOrThrow();
final Collection<String> browserExamKeys = new ArrayList<>();
final String browserExamKeysString = exam.getBrowserExamKeys();
if (StringUtils.isNotBlank(browserExamKeysString)) {
browserExamKeys.addAll(Arrays.asList(StringUtils.split(
browserExamKeysString,
Constants.LIST_SEPARATOR)));
}
final SebRestrictionData sebRestrictionData = new SebRestrictionData(
exam,
configKeys,
browserExamKeys,
// TODO when we have more restriction details available form the Exam, put it to the map
Collections.emptyMap());
if (log.isDebugEnabled()) {
log.debug("Appling SEB Client restriction on LMS with: {}", sebRestrictionData);
}
return this.lmsAPIService
.getLmsAPITemplate(exam.lmsSetupId)
.flatMap(lmsTemplate -> lmsTemplate.applySebClientRestriction(sebRestrictionData))
.map(data -> exam)
.getOrThrow();
});
}
Result<Exam> updateSebClientRestriction(final Exam exam) {
if (!exam.lmsSebRestriction) {
if (log.isDebugEnabled()) {
log.debug("Skip SEB Client restrictions update for exam: {}", exam);
}
return Result.of(exam);
}
if (log.isDebugEnabled()) {
log.debug("Update SEB Client restrictions for exam: {}", exam);
}
// TODO Auto-generated method stub
return null;
}
Result<Exam> releaseSebClientRestriction(final Exam exam) {
if (log.isDebugEnabled()) {
log.debug("Release SEB Client restrictions for exam: {}", exam);
}
return this.lmsAPIService
.getLmsAPITemplate(exam.lmsSetupId)
.flatMap(template -> template.releaseSebClientRestriction(exam));
}
}

43
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SebClientConnectionServiceImpl.java
View file

@ -26,6 +26,7 @@ import ch.ethz.seb.sebserver.gbl.model.session.ClientEvent;
import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.webservice.WebserviceInfo;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientConnectionDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ClientConnectionDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.SebClientConfigDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.SebClientConfigDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.session.EventHandlingStrategy; import ch.ethz.seb.sebserver.webservice.servicelayer.session.EventHandlingStrategy;
@ -48,6 +49,7 @@ public class SebClientConnectionServiceImpl implements SebClientConnectionServic
private final ClientConnectionDAO clientConnectionDAO; private final ClientConnectionDAO clientConnectionDAO;
private final PingHandlingStrategy pingHandlingStrategy; private final PingHandlingStrategy pingHandlingStrategy;
private final SebClientConfigDAO sebClientConfigDAO; private final SebClientConfigDAO sebClientConfigDAO;
private final WebserviceInfo webserviceInfo;
protected SebClientConnectionServiceImpl( protected SebClientConnectionServiceImpl(
final ExamSessionService examSessionService, final ExamSessionService examSessionService,
@ -55,7 +57,8 @@ public class SebClientConnectionServiceImpl implements SebClientConnectionServic
final ClientConnectionDAO clientConnectionDAO, final ClientConnectionDAO clientConnectionDAO,
final EventHandlingStrategyFactory eventHandlingStrategyFactory, final EventHandlingStrategyFactory eventHandlingStrategyFactory,
final PingHandlingStrategyFactory pingHandlingStrategyFactory, final PingHandlingStrategyFactory pingHandlingStrategyFactory,
final SebClientConfigDAO sebClientConfigDAO) { final SebClientConfigDAO sebClientConfigDAO,
final WebserviceInfo webserviceInfo) {
this.examSessionService = examSessionService; this.examSessionService = examSessionService;
this.examSessionCacheService = examSessionCacheService; this.examSessionCacheService = examSessionCacheService;
@ -63,6 +66,7 @@ public class SebClientConnectionServiceImpl implements SebClientConnectionServic
this.pingHandlingStrategy = pingHandlingStrategyFactory.get(); this.pingHandlingStrategy = pingHandlingStrategyFactory.get();
this.eventHandlingStrategy = eventHandlingStrategyFactory.get(); this.eventHandlingStrategy = eventHandlingStrategyFactory.get();
this.sebClientConfigDAO = sebClientConfigDAO; this.sebClientConfigDAO = sebClientConfigDAO;
this.webserviceInfo = webserviceInfo;
} }
@Override @Override
@ -136,20 +140,6 @@ public class SebClientConnectionServiceImpl implements SebClientConnectionServic
}); });
} }
private void checkExamIntegrity(final Long examId) {
// check Exam is running and not locked
checkExamRunning(examId);
if (this.examSessionService.isExamLocked(examId)) {
throw new APIConstraintViolationException(
"Exam is currently on update and locked for new SEB Client connections");
}
// if the cached Exam is not up to date anymore, we have to update the cache first
final Result<Exam> updateExamCache = this.examSessionService.updateExamCache(examId);
if (updateExamCache.hasError()) {
log.warn("Failed to update Exam-Cache for Exam: {}", examId);
}
}
@Override @Override
public Result<ClientConnection> updateClientConnection( public Result<ClientConnection> updateClientConnection(
final String connectionToken, final String connectionToken,
@ -540,4 +530,27 @@ public class SebClientConnectionServiceImpl implements SebClientConnectionServic
return clientConnection; return clientConnection;
} }
private void checkExamIntegrity(final Long examId) {
if (this.webserviceInfo.isDistributed()) {
// if the cached Exam is not up to date anymore, we have to update the cache first
final Result<Exam> updateExamCache = this.examSessionService.updateExamCache(examId);
if (updateExamCache.hasError()) {
log.warn("Failed to update Exam-Cache for Exam: {}", examId);
}
}
// check Exam is running and not locked
checkExamRunning(examId);
if (this.examSessionService.isExamLocked(examId)) {
throw new APIConstraintViolationException(
"Exam is currently on update and locked for new SEB Client connections");
}
// check Exam has an default SEB Exam configuration attached
if (!this.examSessionService.hasDefaultConfigurationAttached(examId)) {
throw new APIConstraintViolationException(
"Exam is currently has no default SEB Exam configuration attached");
}
}
} }

19
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ConfigurationController.java
View file

@ -11,6 +11,8 @@ package ch.ethz.seb.sebserver.webservice.weblayer.api;
import java.util.Collection; import java.util.Collection;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -23,6 +25,7 @@ import ch.ethz.seb.sebserver.gbl.api.API.BulkActionType;
import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration; import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration;
import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; 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.ConfigurationRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ConfigurationRecordDynamicSqlSupport;
import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService; import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService;
import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationService; import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationService;
@ -37,6 +40,8 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationSe
@RequestMapping("${sebserver.webservice.api.admin.endpoint}" + API.CONFIGURATION_ENDPOINT) @RequestMapping("${sebserver.webservice.api.admin.endpoint}" + API.CONFIGURATION_ENDPOINT)
public class ConfigurationController extends ReadonlyEntityController<Configuration, Configuration> { public class ConfigurationController extends ReadonlyEntityController<Configuration, Configuration> {
private static final Logger log = LoggerFactory.getLogger(ConfigurationController.class);
private final ConfigurationDAO configurationDAO; private final ConfigurationDAO configurationDAO;
private final ExamConfigUpdateService examConfigUpdateService; private final ExamConfigUpdateService examConfigUpdateService;
@ -69,7 +74,7 @@ public class ConfigurationController extends ReadonlyEntityController<Configurat
return this.entityDAO.byPK(modelId) return this.entityDAO.byPK(modelId)
.flatMap(this.authorization::checkModify) .flatMap(this.authorization::checkModify)
.flatMap(this.examConfigUpdateService::processSEBExamConfigurationChange) .flatMap(this::processSEBExamConfigurationChange)
.onError(t -> this.examConfigUpdateService.forceReleaseUpdateLocks(modelId)) .onError(t -> this.examConfigUpdateService.forceReleaseUpdateLocks(modelId))
.flatMap(this.userActivityLogDAO::logSaveToHistory) .flatMap(this.userActivityLogDAO::logSaveToHistory)
.getOrThrow(); .getOrThrow();
@ -114,4 +119,16 @@ public class ConfigurationController extends ReadonlyEntityController<Configurat
return ConfigurationRecordDynamicSqlSupport.configurationRecord; return ConfigurationRecordDynamicSqlSupport.configurationRecord;
} }
private Result<Configuration> processSEBExamConfigurationChange(final Configuration config) {
if (config == null) {
return Result.ofError(new NullPointerException("Configuration has null reference"));
}
return this.examConfigUpdateService.processSEBExamConfigurationChange(config.configurationNodeId)
.map(ids -> {
log.info("Successfully updated SEB Configuration for exams: {}", ids);
return config;
});
}
} }

34
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/EntityController.java
View file

@ -39,6 +39,7 @@ import ch.ethz.seb.sebserver.gbl.model.EntityName;
import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport; import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport;
import ch.ethz.seb.sebserver.gbl.model.GrantEntity; import ch.ethz.seb.sebserver.gbl.model.GrantEntity;
import ch.ethz.seb.sebserver.gbl.model.Page; import ch.ethz.seb.sebserver.gbl.model.Page;
import ch.ethz.seb.sebserver.gbl.util.Pair;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService; import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService;
import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationService; import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationService;
@ -312,17 +313,12 @@ public abstract class EntityController<T extends Entity, M extends Entity> {
produces = MediaType.APPLICATION_JSON_UTF8_VALUE) produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public EntityProcessingReport hardDelete(@PathVariable final String modelId) { public EntityProcessingReport hardDelete(@PathVariable final String modelId) {
final EntityType entityType = this.entityDAO.entityType();
return this.entityDAO.byModelId(modelId) return this.entityDAO.byModelId(modelId)
.flatMap(this::checkWriteAccess) .flatMap(this::checkWriteAccess)
.flatMap(entity -> this.bulkActionService.createReport(new BulkAction( .flatMap(this::validForDelete)
BulkActionType.HARD_DELETE, .map(this::bulkDelete)
entityType,
new EntityName(modelId, entityType, entity.getName()))))
.flatMap(this::logBulkAction)
.flatMap(this::notifyDeleted) .flatMap(this::notifyDeleted)
.flatMap(pair -> this.logBulkAction(pair.b))
.getOrThrow(); .getOrThrow();
} }
@ -368,12 +364,20 @@ public abstract class EntityController<T extends Entity, M extends Entity> {
} }
} }
protected Result<T> validForDelete(final T entity) {
if (entity.getModelId() != null) {
return Result.of(entity);
} else {
return Result.ofError(new APIConstraintViolationException("Missing model identifier"));
}
}
protected Result<T> notifySaved(final T entity) { protected Result<T> notifySaved(final T entity) {
return Result.of(entity); return Result.of(entity);
} }
protected Result<EntityProcessingReport> notifyDeleted(final EntityProcessingReport deletionReport) { protected Result<Pair<T, EntityProcessingReport>> notifyDeleted(final Pair<T, EntityProcessingReport> pair) {
return Result.of(deletionReport); return Result.of(pair);
} }
protected Result<T> checkReadAccess(final T entity) { protected Result<T> checkReadAccess(final T entity) {
@ -496,4 +500,14 @@ public abstract class EntityController<T extends Entity, M extends Entity> {
* @return the MyBatis SqlTable for the concrete Entity */ * @return the MyBatis SqlTable for the concrete Entity */
protected abstract SqlTable getSQLTableOfEntity(); protected abstract SqlTable getSQLTableOfEntity();
private Pair<T, EntityProcessingReport> bulkDelete(final T entity) {
return new Pair<>(
entity,
this.bulkActionService.createReport(new BulkAction(
BulkActionType.HARD_DELETE,
entity.entityType(),
new EntityName(entity.getModelId(), entity.entityType(), entity.getName())))
.getOrThrow());
}
} }

2
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPIDiscoveryController.java
View file

@ -43,7 +43,7 @@ public class ExamAPIDiscoveryController {
@PostConstruct @PostConstruct
void init() { void init() {
final String serverURL = this.webserviceInfo.getServerURL(); final String serverURL = this.webserviceInfo.getExternalServerURL();
this.DISCOVERY_INFO = new ExamAPIDiscovery( this.DISCOVERY_INFO = new ExamAPIDiscovery(
"Safe Exam Browser Server / Exam API Description", "Safe Exam Browser Server / Exam API Description",
"This is a description of Safe Exam Browser Server's Exam API", "This is a description of Safe Exam Browser Server's Exam API",

63
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamConfigurationMappingController.java
View file

@ -27,6 +27,7 @@ import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationStatus; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationStatus;
import ch.ethz.seb.sebserver.gbl.model.user.PasswordChange; import ch.ethz.seb.sebserver.gbl.model.user.PasswordChange;
import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
import ch.ethz.seb.sebserver.gbl.util.Pair;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ExamConfigurationMapRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.ExamConfigurationMapRecordDynamicSqlSupport;
import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService; import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService;
@ -36,6 +37,7 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ConfigurationNodeDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.EntityDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.EntityDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.session.ExamConfigUpdateService;
import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationService; import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationService;
@WebServiceProfile @WebServiceProfile
@ -45,6 +47,7 @@ public class ExamConfigurationMappingController extends EntityController<ExamCon
private final ExamDAO examDao; private final ExamDAO examDao;
private final ConfigurationNodeDAO configurationNodeDAO; private final ConfigurationNodeDAO configurationNodeDAO;
private final ExamConfigUpdateService examConfigUpdateService;
protected ExamConfigurationMappingController( protected ExamConfigurationMappingController(
final AuthorizationService authorization, final AuthorizationService authorization,
@ -54,7 +57,8 @@ public class ExamConfigurationMappingController extends EntityController<ExamCon
final PaginationService paginationService, final PaginationService paginationService,
final BeanValidationService beanValidationService, final BeanValidationService beanValidationService,
final ExamDAO examDao, final ExamDAO examDao,
final ConfigurationNodeDAO configurationNodeDAO) { final ConfigurationNodeDAO configurationNodeDAO,
final ExamConfigUpdateService examConfigUpdateService) {
super( super(
authorization, authorization,
@ -66,6 +70,7 @@ public class ExamConfigurationMappingController extends EntityController<ExamCon
this.examDao = examDao; this.examDao = examDao;
this.configurationNodeDAO = configurationNodeDAO; this.configurationNodeDAO = configurationNodeDAO;
this.examConfigUpdateService = examConfigUpdateService;
} }
@Override @Override
@ -106,7 +111,8 @@ public class ExamConfigurationMappingController extends EntityController<ExamCon
protected Result<ExamConfigurationMap> validForCreate(final ExamConfigurationMap entity) { protected Result<ExamConfigurationMap> validForCreate(final ExamConfigurationMap entity) {
return super.validForCreate(entity) return super.validForCreate(entity)
.map(this::checkConfigurationState) .map(this::checkConfigurationState)
.map(this::checkPasswordMatch); .map(this::checkPasswordMatch)
.map(this::checkNoActiveClientConnections);
} }
@Override @Override
@ -115,9 +121,16 @@ public class ExamConfigurationMappingController extends EntityController<ExamCon
.map(this::checkPasswordMatch); .map(this::checkPasswordMatch);
} }
@Override
protected Result<ExamConfigurationMap> validForDelete(final ExamConfigurationMap entity) {
return super.validForDelete(entity)
.map(this::checkNoActiveClientConnections);
}
@Override @Override
protected Result<ExamConfigurationMap> notifyCreated(final ExamConfigurationMap entity) { protected Result<ExamConfigurationMap> notifyCreated(final ExamConfigurationMap entity) {
// update the attached configurations state to "In Use" // update the attached configurations state to "In Use"
// and apply change to involved Exam
return this.configurationNodeDAO.save(new ConfigurationNode( return this.configurationNodeDAO.save(new ConfigurationNode(
entity.configurationNodeId, entity.configurationNodeId,
null, null,
@ -127,27 +140,30 @@ public class ExamConfigurationMappingController extends EntityController<ExamCon
null, null,
null, null,
ConfigurationStatus.IN_USE)) ConfigurationStatus.IN_USE))
.map(config -> entity); .flatMap(config -> this.examConfigUpdateService
.processSEBExamConfigurationAttachmentChange(entity.examId))
.map(id -> entity);
} }
@Override @Override
protected Result<EntityProcessingReport> notifyDeleted(final EntityProcessingReport deletionReport) { protected Result<Pair<ExamConfigurationMap, EntityProcessingReport>> notifyDeleted(
// update the attached configurations state to "Ready" final Pair<ExamConfigurationMap, EntityProcessingReport> pair) {
deletionReport.source
.stream()
.forEach(entityKey -> {
this.configurationNodeDAO.save(new ConfigurationNode(
Long.parseLong(entityKey.modelId),
null,
null,
null,
null,
null,
null,
ConfigurationStatus.READY_TO_USE));
});
return super.notifyDeleted(deletionReport); // update the attached configurations state to "Ready"
// and apply change to involved Exam
return this.configurationNodeDAO.save(new ConfigurationNode(
pair.a.configurationNodeId,
null,
null,
null,
null,
null,
null,
ConfigurationStatus.IN_USE))
.flatMap(config -> this.examConfigUpdateService
.processSEBExamConfigurationAttachmentChange(pair.a.examId))
.map(id -> pair);
} }
private ExamConfigurationMap checkPasswordMatch(final ExamConfigurationMap entity) { private ExamConfigurationMap checkPasswordMatch(final ExamConfigurationMap entity) {
@ -180,4 +196,13 @@ public class ExamConfigurationMappingController extends EntityController<ExamCon
return entity; return entity;
} }
private ExamConfigurationMap checkNoActiveClientConnections(final ExamConfigurationMap entity) {
if (this.examConfigUpdateService.hasActiveSebClientConnections(entity.examId)) {
throw new APIMessageException(ErrorMessage.INTEGRITY_VALIDATION.of(
"The Exam is currently running and has active SEB Client connections"));
}
return entity;
}
} }

4
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/WebClientDetailsService.java
View file

@ -73,8 +73,8 @@ public class WebClientDetailsService implements ClientDetailsService {
return clientDetails; return clientDetails;
} }
protected Result<ClientDetails> getForExamClientAPI(final String clientCongifId) { protected Result<ClientDetails> getForExamClientAPI(final String clientId) {
return this.sebClientConfigService.getClientConfigDetails(clientCongifId); return this.sebClientConfigService.getClientConfigDetails(clientId);
} }
} }

3
src/main/resources/config/application-dev-ws.properties
View file

@ -15,9 +15,6 @@ spring.datasource.hikari.connectionTimeout=30000
spring.datasource.hikari.idleTimeout=600000 spring.datasource.hikari.idleTimeout=600000
spring.datasource.hikari.maxLifetime=1800000 spring.datasource.hikari.maxLifetime=1800000
spring.quartz.job-store-type=memory
spring.quartz.properties.org.quartz.threadPool.threadCount=2
# webservice configuration # webservice configuration
sebserver.webservice.distributed=false sebserver.webservice.distributed=false
sebserver.webservice.http.scheme=http sebserver.webservice.http.scheme=http

4
src/main/resources/data-demo.sql
View file

@ -26,8 +26,8 @@ INSERT IGNORE INTO seb_client_configuration VALUES
; ;
INSERT IGNORE INTO exam VALUES INSERT IGNORE INTO exam VALUES
(1, 1, 1, 'quiz1', 'super-admin', 'super-admin', 'MANAGED', null, null, 'UP_COMING', 0, null, 1), (1, 1, 1, 'quiz1', 'super-admin', 'super-admin', 'MANAGED', null, null, 'UP_COMING', 1, 0, null, 1),
(2, 1, 1, 'quiz6', 'super-admin', 'super-admin', 'MANAGED', null, null, 'RUNNING', 0, null, 1) (2, 1, 1, 'quiz6', 'super-admin', 'super-admin', 'MANAGED', null, null, 'RUNNING', 1, 0, null, 1)
; ;
INSERT IGNORE INTO indicator VALUES INSERT IGNORE INTO indicator VALUES

1
src/main/resources/schema-demo.sql
View file

@ -64,6 +64,7 @@ CREATE TABLE IF NOT EXISTS `exam` (
`quit_password` VARCHAR(4000) NULL, `quit_password` VARCHAR(4000) NULL,
`browser_keys` VARCHAR(4000) NULL, `browser_keys` VARCHAR(4000) NULL,
`status` VARCHAR(255) NOT NULL, `status` VARCHAR(255) NOT NULL,
`lms_seb_restriction` INT(1) NOT NULL,
`updating` INT(1) NOT NULL, `updating` INT(1) NOT NULL,
`lastUpdate` VARCHAR(255) NULL, `lastUpdate` VARCHAR(255) NULL,
`active` INT(1) NOT NULL, `active` INT(1) NOT NULL,

1
src/main/resources/schema-dev.sql
View file

@ -79,6 +79,7 @@ CREATE TABLE IF NOT EXISTS `exam` (
`quit_password` VARCHAR(4000) NULL, `quit_password` VARCHAR(4000) NULL,
`browser_keys` VARCHAR(4000) NULL, `browser_keys` VARCHAR(4000) NULL,
`status` VARCHAR(255) NOT NULL, `status` VARCHAR(255) NOT NULL,
`lms_seb_restriction` INT(1) NOT NULL,
`updating` INT(1) NOT NULL, `updating` INT(1) NOT NULL,
`lastUpdate` VARCHAR(255) NULL, `lastUpdate` VARCHAR(255) NULL,
`active` INT(1) NOT NULL, `active` INT(1) NOT NULL,

2
src/main/resources/schema-prod.sql
View file

@ -68,6 +68,7 @@ CREATE TABLE IF NOT EXISTS `exam` (
`quit_password` VARCHAR(4000) NULL, `quit_password` VARCHAR(4000) NULL,
`browser_keys` VARCHAR(4000) NULL, `browser_keys` VARCHAR(4000) NULL,
`status` VARCHAR(255) NOT NULL, `status` VARCHAR(255) NOT NULL,
`lms_seb_restriction` INT(1) NOT NULL,
`updating` INT(1) NOT NULL, `updating` INT(1) NOT NULL,
`lastUpdate` VARCHAR(255) NULL, `lastUpdate` VARCHAR(255) NULL,
`active` INT(1) NOT NULL, `active` INT(1) NOT NULL,
@ -86,7 +87,6 @@ CREATE TABLE IF NOT EXISTS `exam` (
ON UPDATE NO ACTION) ON UPDATE NO ACTION)
; ;
-- ----------------------------------------------------- -- -----------------------------------------------------
-- Table `client_connection` -- Table `client_connection`
-- ----------------------------------------------------- -- -----------------------------------------------------

Some files were not shown because too many files have changed in this diff Show more