From e37c3234df30515a6486a607e4aad15f20de4ae3 Mon Sep 17 00:00:00 2001 From: anhefti Date: Sat, 25 May 2019 12:29:28 +0200 Subject: [PATCH 1/6] SEBSERV-45 added v-scrolling to main content page --- .../seb/sebserver/gui/content/MainPage.java | 20 ++++++++++++------- .../gui/service/page/PageService.java | 9 ++++++--- .../seb/sebserver/gui/table/EntityTable.java | 7 +++++-- .../sebserver/gui/table/TableNavigator.java | 3 ++- .../sebserver/gui/widget/WidgetFactory.java | 4 ++-- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java index af283fee..009a67fd 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java @@ -82,12 +82,18 @@ public class MainPage implements TemplateComposer { navLayout.marginWidth = 0; nav.setLayout(navLayout); - final Composite content = new Composite(mainSash, SWT.NONE); - content.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - final GridLayout contentOuterlayout = new GridLayout(); - contentOuterlayout.marginHeight = 0; - contentOuterlayout.marginWidth = 0; - content.setLayout(contentOuterlayout); + final Composite content = PageService.createManagedVScrolledComposite( + mainSash, + scrolledComposite -> { + final Composite reusult = new Composite(scrolledComposite, SWT.NONE); + reusult.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + final GridLayout contentOuterlayout = new GridLayout(); + contentOuterlayout.marginHeight = 0; + contentOuterlayout.marginWidth = 0; + reusult.setLayout(contentOuterlayout); + return reusult; + }, + false); final Label toggleView = this.widgetFactory.imageButton( ImageIcon.MAXIMIZE, @@ -130,7 +136,7 @@ public class MainPage implements TemplateComposer { event.action.pageContext().copyOf(contentObjects)), 2)); final Composite actionPane = new Composite(mainSash, SWT.NONE); - actionPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + actionPane.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); final GridLayout actionPaneGrid = new GridLayout(); actionPane.setLayout(actionPaneGrid); actionPane.setData(RWT.CUSTOM_VARIANT, "actionPane"); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java index b9d39822..9e05da1a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java @@ -16,6 +16,7 @@ import java.util.function.Supplier; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.ScrolledComposite; +import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.slf4j.Logger; @@ -187,14 +188,16 @@ public interface PageService { scrolledComposite.setContent(content); scrolledComposite.setExpandHorizontal(true); scrolledComposite.setExpandVertical(true); - scrolledComposite.setSize(parent.computeSize(SWT.DEFAULT, SWT.DEFAULT)); + final Point parentSize = parent.computeSize(SWT.DEFAULT, SWT.DEFAULT); + scrolledComposite.setSize(parentSize); if (showScrollbars) { scrolledComposite.setAlwaysShowScrollBars(true); } final Runnable update = () -> { - scrolledComposite.setMinSize(content.computeSize(SWT.DEFAULT - 20, SWT.DEFAULT)); - ; + final Point computeSize = content.computeSize(SWT.DEFAULT - 20, SWT.DEFAULT); + scrolledComposite.setMinSize(computeSize); + }; scrolledComposite.addListener(SWT.Resize, event -> update.run()); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java b/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java index ed43eb11..f66b8920 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java @@ -100,8 +100,8 @@ public class EntityTable { layout.horizontalSpacing = 0; layout.verticalSpacing = 0; this.composite.setLayout(layout); - GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, true); - gridData.heightHint = (pageSize + 2) * 40; + GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); + // gridData.heightHint = (pageSize + 2) * 40; this.composite.setLayoutData(gridData); // TODO just for debugging, remove when tested @@ -296,6 +296,9 @@ public class EntityTable { // TODO error handling }); + final GridData gridData = (GridData) this.composite.getLayoutData(); + gridData.heightHint = (this.table.getItemCount() + 2) * 50; + this.composite.layout(true, true); } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/table/TableNavigator.java b/src/main/java/ch/ethz/seb/sebserver/gui/table/TableNavigator.java index a160c33a..b00b164e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/table/TableNavigator.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/table/TableNavigator.java @@ -29,7 +29,8 @@ public class TableNavigator { TableNavigator(final EntityTable entityTable) { this.composite = new Composite(entityTable.composite, SWT.NONE); - this.composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true)); + final GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); + this.composite.setLayoutData(gridData); // TODO just for debugging, remove when tested // this.composite.setBackground(new Color(entityTable.composite.getDisplay(), new RGB(200, 0, 0))); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java index 5ba371c1..6b56f394 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java @@ -160,7 +160,7 @@ public class WidgetFactory { public Composite defaultPageLayout(final Composite parent, final LocTextKey title) { final Composite defaultPageLayout = defaultPageLayout(parent); final Label labelLocalizedTitle = labelLocalizedTitle(defaultPageLayout, title); - final GridData gridData = new GridData(SWT.TOP, SWT.LEFT, true, false); + final GridData gridData = new GridData(SWT.TOP, SWT.TOP, true, false); labelLocalizedTitle.setLayoutData(gridData); return defaultPageLayout; } @@ -172,7 +172,7 @@ public class WidgetFactory { final Composite defaultPageLayout = defaultPageLayout(parent); final Label labelLocalizedTitle = labelLocalizedTitle(defaultPageLayout, title); - labelLocalizedTitle.setLayoutData(new GridData(SWT.TOP, SWT.LEFT, true, false)); + labelLocalizedTitle.setLayoutData(new GridData(SWT.TOP, SWT.TOP, true, false)); return defaultPageLayout; } From 322f1c640d90108cce62ad21efce6f7109d16854 Mon Sep 17 00:00:00 2001 From: anhefti Date: Mon, 27 May 2019 08:59:25 +0200 Subject: [PATCH 2/6] SEBSERV-44 added encryption password field to seb config exam mapping --- .../seb/sebserver/gbl/api/EntityType.java | 2 +- .../ethz/seb/sebserver/gbl/model/Domain.java | 3 +- .../model/sebconfig/ExamConfigurationMap.java | 29 +++++++++- .../gui/content/SebExamConfigForm.java | 2 +- .../impl/CellFieldBuilderAdapter.java | 2 +- .../impl/ExamConfigurationServiceImpl.java | 4 +- .../service/examconfig/impl/TableContext.java | 6 ++ .../examconfig/impl/TableFieldBuilder.java | 17 +++++- .../examconfig/impl/ViewGridBuilder.java | 13 +---- .../page/impl/ComposerServiceImpl.java | 6 +- .../sebserver/gui/widget/WidgetFactory.java | 4 +- ...AdditionalAttributesDynamicSqlSupport.java | 14 ++--- .../mapper/AdditionalAttributesMapper.java | 36 ++++++------ ...ientConnectionRecordDynamicSqlSupport.java | 20 +++---- .../mapper/ClientConnectionRecordMapper.java | 36 ++++++------ .../ClientEventRecordDynamicSqlSupport.java | 18 +++--- .../batis/mapper/ClientEventRecordMapper.java | 36 ++++++------ ...ationAttributeRecordDynamicSqlSupport.java | 20 +++---- .../ConfigurationAttributeRecordMapper.java | 36 ++++++------ ...figurationNodeRecordDynamicSqlSupport.java | 20 +++---- .../mapper/ConfigurationNodeRecordMapper.java | 36 ++++++------ .../ConfigurationRecordDynamicSqlSupport.java | 16 ++--- .../mapper/ConfigurationRecordMapper.java | 36 ++++++------ ...igurationValueRecordDynamicSqlSupport.java | 16 ++--- .../ConfigurationValueRecordMapper.java | 36 ++++++------ ...nfigurationMapRecordDynamicSqlSupport.java | 19 +++--- .../ExamConfigurationMapRecordMapper.java | 58 +++++++++++-------- .../mapper/ExamRecordDynamicSqlSupport.java | 24 ++++---- .../batis/mapper/ExamRecordMapper.java | 36 ++++++------ .../IndicatorRecordDynamicSqlSupport.java | 14 ++--- .../batis/mapper/IndicatorRecordMapper.java | 36 ++++++------ .../InstitutionRecordDynamicSqlSupport.java | 16 ++--- .../batis/mapper/InstitutionRecordMapper.java | 36 ++++++------ .../LmsSetupRecordDynamicSqlSupport.java | 22 +++---- .../batis/mapper/LmsSetupRecordMapper.java | 36 ++++++------ .../OrientationRecordDynamicSqlSupport.java | 24 ++++---- .../batis/mapper/OrientationRecordMapper.java | 36 ++++++------ .../mapper/RoleRecordDynamicSqlSupport.java | 10 ++-- .../batis/mapper/RoleRecordMapper.java | 36 ++++++------ ...ebClientConfigRecordDynamicSqlSupport.java | 20 +++---- .../mapper/SebClientConfigRecordMapper.java | 36 ++++++------ .../ThresholdRecordDynamicSqlSupport.java | 12 ++-- .../batis/mapper/ThresholdRecordMapper.java | 36 ++++++------ ...serActivityLogRecordDynamicSqlSupport.java | 18 +++--- .../mapper/UserActivityLogRecordMapper.java | 36 ++++++------ .../mapper/UserRecordDynamicSqlSupport.java | 24 ++++---- .../batis/mapper/UserRecordMapper.java | 36 ++++++------ .../mapper/ViewRecordDynamicSqlSupport.java | 12 ++-- .../batis/mapper/ViewRecordMapper.java | 36 ++++++------ .../batis/model/AdditionalAttributes.java | 28 ++++----- .../batis/model/ClientConnectionRecord.java | 40 ++++++------- .../batis/model/ClientEventRecord.java | 36 ++++++------ .../model/ConfigurationAttributeRecord.java | 40 ++++++------- .../batis/model/ConfigurationNodeRecord.java | 40 ++++++------- .../batis/model/ConfigurationRecord.java | 32 +++++----- .../batis/model/ConfigurationValueRecord.java | 32 +++++----- .../model/ExamConfigurationMapRecord.java | 44 +++++++++----- .../datalayer/batis/model/ExamRecord.java | 48 +++++++-------- .../batis/model/IndicatorRecord.java | 28 ++++----- .../batis/model/InstitutionRecord.java | 32 +++++----- .../datalayer/batis/model/LmsSetupRecord.java | 44 +++++++------- .../batis/model/OrientationRecord.java | 48 +++++++-------- .../datalayer/batis/model/RoleRecord.java | 20 +++---- .../batis/model/SebClientConfigRecord.java | 40 ++++++------- .../batis/model/ThresholdRecord.java | 24 ++++---- .../batis/model/UserActivityLogRecord.java | 36 ++++++------ .../datalayer/batis/model/UserRecord.java | 48 +++++++-------- .../datalayer/batis/model/ViewRecord.java | 24 ++++---- .../dao/impl/ExamConfigurationMapDAOImpl.java | 30 ++++++++-- src/main/resources/messages.properties | 8 +-- src/main/resources/schema-demo.sql | 1 + src/main/resources/schema-dev.sql | 1 + src/test/resources/schema-test.sql | 1 + 73 files changed, 973 insertions(+), 885 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java b/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java index d8e01c07..b9b4eaff 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java @@ -2,7 +2,7 @@ package ch.ethz.seb.sebserver.gbl.api; import javax.annotation.Generated; -@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-05-24T11:57:57.897+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-05-27T08:45:56.340+02:00") public enum EntityType { CONFIGURATION_ATTRIBUTE, CONFIGURATION_VALUE, diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java index d84096e7..9732a236 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java @@ -5,7 +5,7 @@ import javax.annotation.Generated; /** Defines the global names of the domain model and domain model fields. * This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within the integrated GUI * This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/ -@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-05-24T11:57:57.799+02:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-05-27T08:45:56.299+02:00") public interface Domain { interface CONFIGURATION_ATTRIBUTE { @@ -88,6 +88,7 @@ public interface Domain { String ATTR_EXAM_ID = "examId"; String ATTR_CONFIGURATION_NODE_ID = "configurationNodeId"; String ATTR_USER_NAMES = "userNames"; + String ATTR_ENCRYPT_SECRET = "encryptSecret"; } interface EXAM { diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/ExamConfigurationMap.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/ExamConfigurationMap.java index 68fb35b9..1e537d71 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/ExamConfigurationMap.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/ExamConfigurationMap.java @@ -11,16 +11,20 @@ package ch.ethz.seb.sebserver.gbl.model.sebconfig; import javax.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.model.Domain.EXAM_CONFIGURATION_MAP; +import ch.ethz.seb.sebserver.gbl.model.Domain.SEB_CLIENT_CONFIGURATION; import ch.ethz.seb.sebserver.gbl.model.GrantEntity; @JsonIgnoreProperties(ignoreUnknown = true) public final class ExamConfigurationMap implements GrantEntity { + public static final String ATTR_CONFIRM_ENCRYPT_SECRET = "confirm_encrypt_secret"; + public static final String FILTER_ATTR_EXAM_ID = "examId"; public static final String FILTER_ATTR_CONFIG_ID = "configurationNodeId"; @@ -42,19 +46,29 @@ public final class ExamConfigurationMap implements GrantEntity { @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_USER_NAMES) public final String userNames; + @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_ENCRYPT_SECRET) + public final CharSequence encryptSecret; + + @JsonProperty(ATTR_CONFIRM_ENCRYPT_SECRET) + public final CharSequence confirmEncryptSecret; + @JsonCreator public ExamConfigurationMap( @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_ID) final Long id, @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_INSTITUTION_ID) final Long institutionId, @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_EXAM_ID) final Long examId, @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_CONFIGURATION_NODE_ID) final Long configurationNodeId, - @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_USER_NAMES) final String userNames) { + @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_USER_NAMES) final String userNames, + @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET) final CharSequence encryptSecret, + @JsonProperty(ATTR_CONFIRM_ENCRYPT_SECRET) final CharSequence confirmEncryptSecret) { this.id = id; this.institutionId = institutionId; this.examId = examId; this.configurationNodeId = configurationNodeId; this.userNames = userNames; + this.encryptSecret = encryptSecret; + this.confirmEncryptSecret = confirmEncryptSecret; } @Override @@ -95,6 +109,19 @@ public final class ExamConfigurationMap implements GrantEntity { return this.userNames; } + public CharSequence getEncryptSecret() { + return this.encryptSecret; + } + + public CharSequence getConfirmEncryptSecret() { + return this.confirmEncryptSecret; + } + + @JsonIgnore + public boolean hasEncryptionSecret() { + return this.encryptSecret != null && this.encryptSecret.length() > 0; + } + @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigForm.java index 40491be2..f96d0a89 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigForm.java @@ -114,7 +114,7 @@ public class SebExamConfigForm implements TemplateComposer { final List views = this.examConfigurationService.getViews(attributes); final TabFolder tabFolder = widgetFactory.tabFolderLocalized(content); - tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); final List viewContexts = new ArrayList<>(); for (final View view : views) { diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/CellFieldBuilderAdapter.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/CellFieldBuilderAdapter.java index 426c3627..d12c93a6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/CellFieldBuilderAdapter.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/CellFieldBuilderAdapter.java @@ -207,7 +207,7 @@ interface CellFieldBuilderAdapter { this.width, groupLabelKey, groupTooltipKey); - group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, this.width, this.height)); + group.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, this.width, this.height)); final ViewGridBuilder groupBuilder = new ViewGridBuilder( group, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/ExamConfigurationServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/ExamConfigurationServiceImpl.java index afe6f7ff..41e6b806 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/ExamConfigurationServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/ExamConfigurationServiceImpl.java @@ -165,7 +165,9 @@ public class ExamConfigurationServiceImpl implements ExamConfigurationService { final GridLayout gridLayout = new GridLayout(viewContext.getColumns(), true); gridLayout.verticalSpacing = 0; composite.setLayout(gridLayout); - composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + final GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); + gridData.heightHint = 200; + composite.setLayoutData(gridData); final ViewGridBuilder viewGridBuilder = new ViewGridBuilder( composite, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableContext.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableContext.java index 099e2985..57e7cf15 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableContext.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableContext.java @@ -17,9 +17,11 @@ import java.util.Set; import java.util.stream.Collectors; import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.model.Domain; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationAttribute; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationTableValues.TableValue; @@ -187,6 +189,10 @@ public class TableContext { } public String getRowValue(final TableValue tableValue) { + if (tableValue == null || StringUtils.isBlank(tableValue.value)) { + return Constants.EMPTY_NOTE; + } + final ConfigurationAttribute attribute = this.viewContext.getAttribute(tableValue.attributeId); if (attribute != null) { switch (attribute.type) { diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableFieldBuilder.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableFieldBuilder.java index b8f1955d..54aa887a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableFieldBuilder.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableFieldBuilder.java @@ -16,6 +16,7 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; +import org.apache.commons.lang3.BooleanUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -291,9 +292,19 @@ public class TableFieldBuilder implements InputFieldBuilder { int cellIndex = 0; for (final ConfigurationAttribute attr : this.tableContext.getColumnAttributes()) { if (rowValues.containsKey(attr.id)) { - item.setText( - cellIndex, - this.tableContext.getRowValue(rowValues.get(attr.id))); + final TableValue tableValue = rowValues.get(attr.id); + if (attr.type == AttributeType.CHECKBOX) { + + item.setImage( + cellIndex, + (BooleanUtils.toBoolean((tableValue != null) ? tableValue.value : null)) + ? ImageIcon.ACTIVE.getImage(this.control.getDisplay()) + : ImageIcon.INACTIVE.getImage(this.control.getDisplay())); + } else { + item.setText( + cellIndex, + this.tableContext.getRowValue(tableValue)); + } } cellIndex++; } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/ViewGridBuilder.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/ViewGridBuilder.java index e12692e7..2e026149 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/ViewGridBuilder.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/ViewGridBuilder.java @@ -132,17 +132,6 @@ public class ViewGridBuilder { } break; } -// case LEFT_SPAN: { -// int spanxpos = xpos - orientation.width; -// if (spanxpos < 0) { -// spanxpos = 0; -// } -// fillDummy(spanxpos, ypos, orientation.width, 1); -// this.grid[ypos][spanxpos] = CellFieldBuilderAdapter.labelBuilder( -// attribute, -// orientation); -// break; -// } case TOP: { fillDummy(xpos, ypos - 1, orientation.width, 1); this.grid[ypos - 1][xpos] = CellFieldBuilderAdapter.labelBuilder( @@ -178,7 +167,7 @@ public class ViewGridBuilder { for (int x = 0; x < this.grid[y].length; x++) { if (this.grid[y][x] == null) { final Label empty = new Label(this.parent, SWT.LEFT); - final GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false); + final GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); gridData.verticalIndent = 8; empty.setLayoutData(gridData); empty.setText(StringUtils.EMPTY /* "empty " + x + " " + y */); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ComposerServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ComposerServiceImpl.java index 8b5733d5..e24b2eff 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ComposerServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ComposerServiceImpl.java @@ -24,6 +24,7 @@ import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport; import ch.ethz.seb.sebserver.gui.service.page.ComposerService; import ch.ethz.seb.sebserver.gui.service.page.PageContext; import ch.ethz.seb.sebserver.gui.service.page.PageDefinition; +import ch.ethz.seb.sebserver.gui.service.page.PageService; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.AuthorizationContextHolder; @@ -118,8 +119,9 @@ public class ComposerServiceImpl implements ComposerService { try { composer.compose(pageContext); - } catch (final Exception e) { - log.warn("Failed to compose: {}, pageContext: {}", name, pageContext, e); + PageService.updateScrolledComposite(pageContext.getParent()); + } catch (final Throwable e) { + log.error("Failed to compose: {}, pageContext: {}", name, pageContext, e); } try { diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java index 6b56f394..58949702 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java @@ -160,7 +160,7 @@ public class WidgetFactory { public Composite defaultPageLayout(final Composite parent, final LocTextKey title) { final Composite defaultPageLayout = defaultPageLayout(parent); final Label labelLocalizedTitle = labelLocalizedTitle(defaultPageLayout, title); - final GridData gridData = new GridData(SWT.TOP, SWT.TOP, true, false); + final GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); labelLocalizedTitle.setLayoutData(gridData); return defaultPageLayout; } @@ -172,7 +172,7 @@ public class WidgetFactory { final Composite defaultPageLayout = defaultPageLayout(parent); final Label labelLocalizedTitle = labelLocalizedTitle(defaultPageLayout, title); - labelLocalizedTitle.setLayoutData(new GridData(SWT.TOP, SWT.TOP, true, false)); + labelLocalizedTitle.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); return defaultPageLayout; } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java index 711d17d1..9f679371 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java @@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class AdditionalAttributesDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.143+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source Table: additional_attributes") public static final AdditionalAttributes additionalAttributes = new AdditionalAttributes(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.143+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.id") public static final SqlColumn id = additionalAttributes.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.143+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.entity_type") public static final SqlColumn entityType = additionalAttributes.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.entity_id") public static final SqlColumn entityId = additionalAttributes.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.name") public static final SqlColumn name = additionalAttributes.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.value") public static final SqlColumn value = additionalAttributes.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.143+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source Table: additional_attributes") public static final class AdditionalAttributes extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java index 7c1224b2..c29448db 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface AdditionalAttributesMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface AdditionalAttributesMapper { }) AdditionalAttributes selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface AdditionalAttributesMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(additionalAttributes); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributes); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributes) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface AdditionalAttributesMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.144+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default int insert(AdditionalAttributes record) { return insert(SqlBuilder.insert(record) .into(additionalAttributes) @@ -102,7 +102,7 @@ public interface AdditionalAttributesMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.145+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default int insertSelective(AdditionalAttributes record) { return insert(SqlBuilder.insert(record) .into(additionalAttributes) @@ -114,19 +114,19 @@ public interface AdditionalAttributesMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.145+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, entityType, entityId, name, value) .from(additionalAttributes); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.145+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, entityType, entityId, name, value) .from(additionalAttributes); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.145+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default AdditionalAttributes selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, entityType, entityId, name, value) .from(additionalAttributes) @@ -135,7 +135,7 @@ public interface AdditionalAttributesMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.145+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default UpdateDSL> updateByExample(AdditionalAttributes record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributes) .set(entityType).equalTo(record::getEntityType) @@ -144,7 +144,7 @@ public interface AdditionalAttributesMapper { .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.145+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default UpdateDSL> updateByExampleSelective(AdditionalAttributes record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributes) .set(entityType).equalToWhenPresent(record::getEntityType) @@ -153,7 +153,7 @@ public interface AdditionalAttributesMapper { .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.145+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default int updateByPrimaryKey(AdditionalAttributes record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributes) .set(entityType).equalTo(record::getEntityType) @@ -165,7 +165,7 @@ public interface AdditionalAttributesMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.145+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.474+02:00", comments="Source Table: additional_attributes") default int updateByPrimaryKeySelective(AdditionalAttributes record) { return UpdateDSL.updateWithMapper(this::update, additionalAttributes) .set(entityType).equalToWhenPresent(record::getEntityType) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java index 76ddb40c..657b3a5c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java @@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientConnectionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.085+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source Table: client_connection") public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.086+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source field: client_connection.id") public static final SqlColumn id = clientConnectionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.086+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source field: client_connection.exam_id") public static final SqlColumn examId = clientConnectionRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.086+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source field: client_connection.status") public static final SqlColumn status = clientConnectionRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.086+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source field: client_connection.connection_token") public static final SqlColumn connectionToken = clientConnectionRecord.connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.086+02:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source field: client_connection.user_name") public static final SqlColumn userName = clientConnectionRecord.userName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.087+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source field: client_connection.vdi") public static final SqlColumn vdi = clientConnectionRecord.vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.087+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source field: client_connection.client_address") public static final SqlColumn clientAddress = clientConnectionRecord.clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.087+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source field: client_connection.virtual_client_address") public static final SqlColumn virtualClientAddress = clientConnectionRecord.virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.085+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source Table: client_connection") public static final class ClientConnectionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java index 526505c1..c65dde78 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientConnectionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.087+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.087+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.087+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.087+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ClientConnectionRecordMapper { }) ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.087+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ClientConnectionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.087+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.087+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default int insert(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -111,7 +111,7 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default int insertSelective(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -126,19 +126,19 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default ClientConnectionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) .from(clientConnectionRecord) @@ -147,7 +147,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default UpdateDSL> updateByExample(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalTo(record::getExamId) @@ -159,7 +159,7 @@ public interface ClientConnectionRecordMapper { .set(virtualClientAddress).equalTo(record::getVirtualClientAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default UpdateDSL> updateByExampleSelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -171,7 +171,7 @@ public interface ClientConnectionRecordMapper { .set(virtualClientAddress).equalToWhenPresent(record::getVirtualClientAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.436+02:00", comments="Source Table: client_connection") default int updateByPrimaryKey(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalTo(record::getExamId) @@ -186,7 +186,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.088+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source Table: client_connection") default int updateByPrimaryKeySelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java index f130016d..82fc3d5e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java @@ -7,31 +7,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientEventRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.091+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.438+02:00", comments="Source Table: client_event") public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.092+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.438+02:00", comments="Source field: client_event.id") public static final SqlColumn id = clientEventRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.092+02:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.438+02:00", comments="Source field: client_event.connection_id") public static final SqlColumn connectionId = clientEventRecord.connectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.092+02:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.438+02:00", comments="Source field: client_event.user_identifier") public static final SqlColumn userIdentifier = clientEventRecord.userIdentifier; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.092+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.438+02:00", comments="Source field: client_event.type") public static final SqlColumn type = clientEventRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.093+02:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.438+02:00", comments="Source field: client_event.timestamp") public static final SqlColumn timestamp = clientEventRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.093+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.438+02:00", comments="Source field: client_event.numeric_value") public static final SqlColumn numericValue = clientEventRecord.numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.093+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.438+02:00", comments="Source field: client_event.text") public static final SqlColumn text = clientEventRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.092+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.438+02:00", comments="Source Table: client_event") public static final class ClientEventRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java index 18634c8f..fe56353f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java @@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientEventRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.093+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.093+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.093+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.093+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ClientEventRecordMapper { }) ClientEventRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.093+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -72,22 +72,22 @@ public interface ClientEventRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.094+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.094+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.094+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.094+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord) .where(id, isEqualTo(id_)) @@ -95,7 +95,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.094+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default int insert(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -109,7 +109,7 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.094+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default int insertSelective(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -123,19 +123,19 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.094+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.094+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.094+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default ClientEventRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, userIdentifier, type, timestamp, numericValue, text) .from(clientEventRecord) @@ -144,7 +144,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.094+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default UpdateDSL> updateByExample(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalTo(record::getConnectionId) @@ -155,7 +155,7 @@ public interface ClientEventRecordMapper { .set(text).equalTo(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.095+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default UpdateDSL> updateByExampleSelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalToWhenPresent(record::getConnectionId) @@ -166,7 +166,7 @@ public interface ClientEventRecordMapper { .set(text).equalToWhenPresent(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.095+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default int updateByPrimaryKey(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalTo(record::getConnectionId) @@ -180,7 +180,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.095+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: client_event") default int updateByPrimaryKeySelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalToWhenPresent(record::getConnectionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java index ffb1c7ab..3f510dc3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java @@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationAttributeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.729+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.269+02:00", comments="Source Table: configuration_attribute") public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.735+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.272+02:00", comments="Source field: configuration_attribute.id") public static final SqlColumn id = configurationAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.737+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.273+02:00", comments="Source field: configuration_attribute.name") public static final SqlColumn name = configurationAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.739+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.273+02:00", comments="Source field: configuration_attribute.type") public static final SqlColumn type = configurationAttributeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.739+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.273+02:00", comments="Source field: configuration_attribute.parent_id") public static final SqlColumn parentId = configurationAttributeRecord.parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.740+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.274+02:00", comments="Source field: configuration_attribute.resources") public static final SqlColumn resources = configurationAttributeRecord.resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.741+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.274+02:00", comments="Source field: configuration_attribute.validator") public static final SqlColumn validator = configurationAttributeRecord.validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.741+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.274+02:00", comments="Source field: configuration_attribute.dependencies") public static final SqlColumn dependencies = configurationAttributeRecord.dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.742+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.274+02:00", comments="Source field: configuration_attribute.default_value") public static final SqlColumn defaultValue = configurationAttributeRecord.defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.734+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.272+02:00", comments="Source Table: configuration_attribute") public static final class ConfigurationAttributeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java index 7b9a55b3..c419eddf 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationAttributeRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.745+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.275+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.747+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.277+02:00", comments="Source Table: configuration_attribute") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.749+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.278+02:00", comments="Source Table: configuration_attribute") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.751+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.279+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationAttributeRecordMapper { }) ConfigurationAttributeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.753+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.280+02:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ConfigurationAttributeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.754+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.281+02:00", comments="Source Table: configuration_attribute") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.755+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.282+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.759+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.283+02:00", comments="Source Table: configuration_attribute") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.760+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.284+02:00", comments="Source Table: configuration_attribute") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.761+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.284+02:00", comments="Source Table: configuration_attribute") default int insert(ConfigurationAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationAttributeRecord) @@ -111,7 +111,7 @@ public interface ConfigurationAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.764+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.285+02:00", comments="Source Table: configuration_attribute") default int insertSelective(ConfigurationAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationAttributeRecord) @@ -126,19 +126,19 @@ public interface ConfigurationAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.765+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.285+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.767+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.285+02:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.768+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.285+02:00", comments="Source Table: configuration_attribute") default ConfigurationAttributeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord) @@ -147,7 +147,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.770+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.285+02:00", comments="Source Table: configuration_attribute") default UpdateDSL> updateByExample(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalTo(record::getName) @@ -159,7 +159,7 @@ public interface ConfigurationAttributeRecordMapper { .set(defaultValue).equalTo(record::getDefaultValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.772+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.285+02:00", comments="Source Table: configuration_attribute") default UpdateDSL> updateByExampleSelective(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalToWhenPresent(record::getName) @@ -171,7 +171,7 @@ public interface ConfigurationAttributeRecordMapper { .set(defaultValue).equalToWhenPresent(record::getDefaultValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.774+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.290+02:00", comments="Source Table: configuration_attribute") default int updateByPrimaryKey(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalTo(record::getName) @@ -186,7 +186,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.776+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.291+02:00", comments="Source Table: configuration_attribute") default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java index 638d4ed7..1c2a21db 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java @@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationNodeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.065+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source Table: configuration_node") public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.065+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.id") public static final SqlColumn id = configurationNodeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.065+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.institution_id") public static final SqlColumn institutionId = configurationNodeRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.065+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.421+02:00", comments="Source field: configuration_node.template_id") public static final SqlColumn templateId = configurationNodeRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.066+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.421+02:00", comments="Source field: configuration_node.owner") public static final SqlColumn owner = configurationNodeRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.066+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.421+02:00", comments="Source field: configuration_node.name") public static final SqlColumn name = configurationNodeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.066+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.421+02:00", comments="Source field: configuration_node.description") public static final SqlColumn description = configurationNodeRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.066+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.421+02:00", comments="Source field: configuration_node.type") public static final SqlColumn type = configurationNodeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.066+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.421+02:00", comments="Source field: configuration_node.status") public static final SqlColumn status = configurationNodeRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.065+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source Table: configuration_node") public static final class ConfigurationNodeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java index 09bfd605..f222e3b8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationNodeRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.067+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.421+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.067+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.421+02:00", comments="Source Table: configuration_node") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.067+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.421+02:00", comments="Source Table: configuration_node") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.067+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.421+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationNodeRecordMapper { }) ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.067+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ConfigurationNodeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.067+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.067+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.067+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.068+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.068+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default int insert(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -111,7 +111,7 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.068+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default int insertSelective(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -126,19 +126,19 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.068+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.068+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.068+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, templateId, owner, name, description, type, status) .from(configurationNodeRecord) @@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.068+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExample(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -159,7 +159,7 @@ public interface ConfigurationNodeRecordMapper { .set(status).equalTo(record::getStatus); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.068+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExampleSelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -171,7 +171,7 @@ public interface ConfigurationNodeRecordMapper { .set(status).equalToWhenPresent(record::getStatus); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.068+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.422+02:00", comments="Source Table: configuration_node") default int updateByPrimaryKey(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -186,7 +186,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.069+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.423+02:00", comments="Source Table: configuration_node") default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java index b61a75d2..db315d8d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java @@ -7,28 +7,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.058+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source Table: configuration") public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.059+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.417+02:00", comments="Source field: configuration.id") public static final SqlColumn id = configurationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.059+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.417+02:00", comments="Source field: configuration.institution_id") public static final SqlColumn institutionId = configurationRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.059+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.417+02:00", comments="Source field: configuration.configuration_node_id") public static final SqlColumn configurationNodeId = configurationRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.060+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.417+02:00", comments="Source field: configuration.version") public static final SqlColumn version = configurationRecord.version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.060+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.417+02:00", comments="Source field: configuration.version_date") public static final SqlColumn versionDate = configurationRecord.versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.060+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.417+02:00", comments="Source field: configuration.followup") public static final SqlColumn followup = configurationRecord.followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.059+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source Table: configuration") public static final class ConfigurationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java index a642a211..39924a06 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.060+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.417+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.060+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.061+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.061+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationRecordMapper { }) ConfigurationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.061+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface ConfigurationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.061+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.061+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.061+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.061+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.061+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") default int insert(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -107,7 +107,7 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.061+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") default int insertSelective(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -120,19 +120,19 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.062+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.062+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.062+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") default ConfigurationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationNodeId, version, versionDate, followup) .from(configurationRecord) @@ -141,7 +141,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.062+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") default UpdateDSL> updateByExample(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -151,7 +151,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalTo(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.062+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.418+02:00", comments="Source Table: configuration") default UpdateDSL> updateByExampleSelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -161,7 +161,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalToWhenPresent(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.062+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.419+02:00", comments="Source Table: configuration") default int updateByPrimaryKey(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -174,7 +174,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.062+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.419+02:00", comments="Source Table: configuration") default int updateByPrimaryKeySelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java index 22816add..9eabeeb7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationValueRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.036+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source Table: configuration_value") public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.036+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source field: configuration_value.id") public static final SqlColumn id = configurationValueRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.036+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source field: configuration_value.institution_id") public static final SqlColumn institutionId = configurationValueRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.036+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source field: configuration_value.configuration_id") public static final SqlColumn configurationId = configurationValueRecord.configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.036+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source field: configuration_value.configuration_attribute_id") public static final SqlColumn configurationAttributeId = configurationValueRecord.configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.037+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source field: configuration_value.list_index") public static final SqlColumn listIndex = configurationValueRecord.listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.037+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source field: configuration_value.value") public static final SqlColumn value = configurationValueRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.036+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source Table: configuration_value") public static final class ConfigurationValueRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java index 09b77942..b57e993a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationValueRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.037+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.037+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source Table: configuration_value") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.037+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source Table: configuration_value") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.037+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ConfigurationValueRecordMapper { }) ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.037+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.407+02:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ConfigurationValueRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.038+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.038+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.038+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.038+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.038+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default int insert(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -105,7 +105,7 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.038+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default int insertSelective(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -118,19 +118,19 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.038+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.038+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.038+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default ConfigurationValueRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationId, configurationAttributeId, listIndex, value) .from(configurationValueRecord) @@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.039+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExample(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -149,7 +149,7 @@ public interface ConfigurationValueRecordMapper { .set(value).equalTo(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.039+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExampleSelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -159,7 +159,7 @@ public interface ConfigurationValueRecordMapper { .set(value).equalToWhenPresent(record::getValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.039+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default int updateByPrimaryKey(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -172,7 +172,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.039+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.408+02:00", comments="Source Table: configuration_value") default int updateByPrimaryKeySelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java index a65f1791..fc2aebe2 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java @@ -6,25 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamConfigurationMapRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.072+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source Table: exam_configuration_map") public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.073+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source field: exam_configuration_map.id") public static final SqlColumn id = examConfigurationMapRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.073+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source field: exam_configuration_map.institution_id") public static final SqlColumn institutionId = examConfigurationMapRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.073+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source field: exam_configuration_map.exam_id") public static final SqlColumn examId = examConfigurationMapRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source field: exam_configuration_map.configuration_node_id") public static final SqlColumn configurationNodeId = examConfigurationMapRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source field: exam_configuration_map.user_names") public static final SqlColumn userNames = examConfigurationMapRecord.userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.072+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + public static final SqlColumn encryptSecret = examConfigurationMapRecord.encryptSecret; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source Table: exam_configuration_map") public static final class ExamConfigurationMapRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); @@ -36,6 +39,8 @@ public final class ExamConfigurationMapRecordDynamicSqlSupport { public final SqlColumn userNames = column("user_names", JDBCType.VARCHAR); + public final SqlColumn encryptSecret = column("encrypt_secret", JDBCType.VARCHAR); + public ExamConfigurationMapRecord() { super("exam_configuration_map"); } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java index 60244f85..d4437ee0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java @@ -32,57 +32,59 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamConfigurationMapRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source Table: exam_configuration_map") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source Table: exam_configuration_map") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), @Arg(column="exam_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), @Arg(column="configuration_node_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), - @Arg(column="user_names", javaType=String.class, jdbcType=JdbcType.VARCHAR) + @Arg(column="user_names", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="encrypt_secret", javaType=String.class, jdbcType=JdbcType.VARCHAR) }) ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.426+02:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), @Arg(column="exam_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), @Arg(column="configuration_node_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), - @Arg(column="user_names", javaType=String.class, jdbcType=JdbcType.VARCHAR) + @Arg(column="user_names", javaType=String.class, jdbcType=JdbcType.VARCHAR), + @Arg(column="encrypt_secret", javaType=String.class, jdbcType=JdbcType.VARCHAR) }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.074+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord) .where(id, isEqualTo(id_)) @@ -90,7 +92,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default int insert(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -98,11 +100,12 @@ public interface ExamConfigurationMapRecordMapper { .map(examId).toProperty("examId") .map(configurationNodeId).toProperty("configurationNodeId") .map(userNames).toProperty("userNames") + .map(encryptSecret).toProperty("encryptSecret") .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default int insertSelective(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -110,68 +113,73 @@ public interface ExamConfigurationMapRecordMapper { .map(examId).toPropertyWhenPresent("examId", record::getExamId) .map(configurationNodeId).toPropertyWhenPresent("configurationNodeId", record::getConfigurationNodeId) .map(userNames).toPropertyWhenPresent("userNames", record::getUserNames) + .map(encryptSecret).toPropertyWhenPresent("encryptSecret", record::getEncryptSecret) .build() .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectByExample() { - return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames) + return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectDistinctByExample() { - return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames) + return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) { - return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, userNames) + return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) .from(examConfigurationMapRecord) .where(id, isEqualTo(id_)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExample(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalTo(record::getInstitutionId) .set(examId).equalTo(record::getExamId) .set(configurationNodeId).equalTo(record::getConfigurationNodeId) - .set(userNames).equalTo(record::getUserNames); + .set(userNames).equalTo(record::getUserNames) + .set(encryptSecret).equalTo(record::getEncryptSecret); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExampleSelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(examId).equalToWhenPresent(record::getExamId) .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId) - .set(userNames).equalToWhenPresent(record::getUserNames); + .set(userNames).equalToWhenPresent(record::getUserNames) + .set(encryptSecret).equalToWhenPresent(record::getEncryptSecret); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKey(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalTo(record::getInstitutionId) .set(examId).equalTo(record::getExamId) .set(configurationNodeId).equalTo(record::getConfigurationNodeId) .set(userNames).equalTo(record::getUserNames) + .set(encryptSecret).equalTo(record::getEncryptSecret) .where(id, isEqualTo(record::getId)) .build() .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.075+02:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.427+02:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(examId).equalToWhenPresent(record::getExamId) .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId) .set(userNames).equalToWhenPresent(record::getUserNames) + .set(encryptSecret).equalToWhenPresent(record::getEncryptSecret) .where(id, isEqualTo(record::getId)) .build() .execute(); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java index aaf3cfc4..0a03404a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java @@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.080+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.431+02:00", comments="Source Table: exam") public static final ExamRecord examRecord = new ExamRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.080+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.431+02:00", comments="Source field: exam.id") public static final SqlColumn id = examRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.080+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.431+02:00", comments="Source field: exam.institution_id") public static final SqlColumn institutionId = examRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.080+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.431+02:00", comments="Source field: exam.lms_setup_id") public static final SqlColumn lmsSetupId = examRecord.lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.080+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.431+02:00", comments="Source field: exam.external_id") public static final SqlColumn externalId = examRecord.externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.080+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.431+02:00", comments="Source field: exam.owner") public static final SqlColumn owner = examRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.081+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.431+02:00", comments="Source field: exam.supporter") public static final SqlColumn supporter = examRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.081+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.431+02:00", comments="Source field: exam.type") public static final SqlColumn type = examRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.081+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source field: exam.quit_password") public static final SqlColumn quitPassword = examRecord.quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.081+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source field: exam.browser_keys") public static final SqlColumn browserKeys = examRecord.browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.081+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source field: exam.active") public static final SqlColumn active = examRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.080+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.431+02:00", comments="Source Table: exam") public static final class ExamRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java index 3441f897..76a14af8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.081+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.081+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source Table: exam") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.081+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source Table: exam") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.081+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface ExamRecordMapper { }) ExamRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -77,22 +77,22 @@ public interface ExamRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source Table: exam") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source Table: exam") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.432+02:00", comments="Source Table: exam") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.433+02:00", comments="Source Table: exam") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.433+02:00", comments="Source Table: exam") default int insert(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -117,7 +117,7 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.433+02:00", comments="Source Table: exam") default int insertSelective(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -134,19 +134,19 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.433+02:00", comments="Source Table: exam") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, active) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.433+02:00", comments="Source Table: exam") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, active) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.433+02:00", comments="Source Table: exam") default ExamRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, active) .from(examRecord) @@ -155,7 +155,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.082+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.433+02:00", comments="Source Table: exam") default UpdateDSL> updateByExample(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -169,7 +169,7 @@ public interface ExamRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.083+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.433+02:00", comments="Source Table: exam") default UpdateDSL> updateByExampleSelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -183,7 +183,7 @@ public interface ExamRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.083+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.433+02:00", comments="Source Table: exam") default int updateByPrimaryKey(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -200,7 +200,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.083+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.433+02:00", comments="Source Table: exam") default int updateByPrimaryKeySelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java index 13da8653..7a584942 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java @@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class IndicatorRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.097+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source Table: indicator") public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.097+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.id") public static final SqlColumn id = indicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.097+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.exam_id") public static final SqlColumn examId = indicatorRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.097+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.type") public static final SqlColumn type = indicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.097+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.name") public static final SqlColumn name = indicatorRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.097+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.color") public static final SqlColumn color = indicatorRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.097+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source Table: indicator") public static final class IndicatorRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java index a068a626..7363dc77 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface IndicatorRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.097+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.097+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.097+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface IndicatorRecordMapper { }) IndicatorRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface IndicatorRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default int insert(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -102,7 +102,7 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default int insertSelective(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -114,19 +114,19 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, type, name, color) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, type, name, color) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default IndicatorRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, type, name, color) .from(indicatorRecord) @@ -135,7 +135,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default UpdateDSL> updateByExample(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -144,7 +144,7 @@ public interface IndicatorRecordMapper { .set(color).equalTo(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.098+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default UpdateDSL> updateByExampleSelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -153,7 +153,7 @@ public interface IndicatorRecordMapper { .set(color).equalToWhenPresent(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.099+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default int updateByPrimaryKey(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -165,7 +165,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.099+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: indicator") default int updateByPrimaryKeySelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java index c2253de0..73b361f5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class InstitutionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.107+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.447+02:00", comments="Source Table: institution") public static final InstitutionRecord institutionRecord = new InstitutionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.108+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.447+02:00", comments="Source field: institution.id") public static final SqlColumn id = institutionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.108+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.447+02:00", comments="Source field: institution.name") public static final SqlColumn name = institutionRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.108+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.447+02:00", comments="Source field: institution.url_suffix") public static final SqlColumn urlSuffix = institutionRecord.urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.108+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.447+02:00", comments="Source field: institution.theme_name") public static final SqlColumn themeName = institutionRecord.themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.108+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.447+02:00", comments="Source field: institution.active") public static final SqlColumn active = institutionRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.108+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source field: institution.logo_image") public static final SqlColumn logoImage = institutionRecord.logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.107+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.447+02:00", comments="Source Table: institution") public static final class InstitutionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java index c8f66a4b..6db75a52 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface InstitutionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.109+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.109+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.109+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.109+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface InstitutionRecordMapper { }) InstitutionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.109+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface InstitutionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.109+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.109+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.109+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.110+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.110+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") default int insert(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -105,7 +105,7 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.110+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") default int insertSelective(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -118,19 +118,19 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.110+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.110+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.448+02:00", comments="Source Table: institution") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.110+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.449+02:00", comments="Source Table: institution") default InstitutionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage) .from(institutionRecord) @@ -139,7 +139,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.110+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.449+02:00", comments="Source Table: institution") default UpdateDSL> updateByExample(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -149,7 +149,7 @@ public interface InstitutionRecordMapper { .set(logoImage).equalTo(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.110+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.449+02:00", comments="Source Table: institution") default UpdateDSL> updateByExampleSelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) @@ -159,7 +159,7 @@ public interface InstitutionRecordMapper { .set(logoImage).equalToWhenPresent(record::getLogoImage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.111+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.449+02:00", comments="Source Table: institution") default int updateByPrimaryKey(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -172,7 +172,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.111+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.449+02:00", comments="Source Table: institution") default int updateByPrimaryKeySelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java index 9551075d..199a6e34 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java @@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class LmsSetupRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.119+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source Table: lms_setup") public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.119+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source field: lms_setup.id") public static final SqlColumn id = lmsSetupRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.120+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source field: lms_setup.institution_id") public static final SqlColumn institutionId = lmsSetupRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.120+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source field: lms_setup.name") public static final SqlColumn name = lmsSetupRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.120+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source field: lms_setup.lms_type") public static final SqlColumn lmsType = lmsSetupRecord.lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.121+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source field: lms_setup.lms_url") public static final SqlColumn lmsUrl = lmsSetupRecord.lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.121+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source field: lms_setup.lms_clientname") public static final SqlColumn lmsClientname = lmsSetupRecord.lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.121+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source field: lms_setup.lms_clientsecret") public static final SqlColumn lmsClientsecret = lmsSetupRecord.lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.121+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source field: lms_setup.lms_rest_api_token") public static final SqlColumn lmsRestApiToken = lmsSetupRecord.lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.122+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source field: lms_setup.active") public static final SqlColumn active = lmsSetupRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.119+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source Table: lms_setup") public static final class LmsSetupRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java index 3e76dd54..3153539b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface LmsSetupRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source Table: lms_setup") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.122+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source Table: lms_setup") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.123+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -60,7 +60,7 @@ public interface LmsSetupRecordMapper { }) LmsSetupRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.125+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source Table: lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface LmsSetupRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.126+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source Table: lms_setup") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.126+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source Table: lms_setup") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.126+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.455+02:00", comments="Source Table: lms_setup") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.126+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.456+02:00", comments="Source Table: lms_setup") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.126+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.456+02:00", comments="Source Table: lms_setup") default int insert(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -114,7 +114,7 @@ public interface LmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.127+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.456+02:00", comments="Source Table: lms_setup") default int insertSelective(LmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(lmsSetupRecord) @@ -130,19 +130,19 @@ public interface LmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.127+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.456+02:00", comments="Source Table: lms_setup") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, active) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.127+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.456+02:00", comments="Source Table: lms_setup") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, active) .from(lmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.127+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.456+02:00", comments="Source Table: lms_setup") default LmsSetupRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, active) .from(lmsSetupRecord) @@ -151,7 +151,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.127+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.456+02:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExample(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -164,7 +164,7 @@ public interface LmsSetupRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.128+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.456+02:00", comments="Source Table: lms_setup") default UpdateDSL> updateByExampleSelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -177,7 +177,7 @@ public interface LmsSetupRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.128+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.456+02:00", comments="Source Table: lms_setup") default int updateByPrimaryKey(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -193,7 +193,7 @@ public interface LmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.128+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.456+02:00", comments="Source Table: lms_setup") default int updateByPrimaryKeySelective(LmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java index 01bc40ee..a553b75c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java @@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class OrientationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.050+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source Table: orientation") public static final OrientationRecord orientationRecord = new OrientationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.050+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.413+02:00", comments="Source field: orientation.id") public static final SqlColumn id = orientationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.051+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.413+02:00", comments="Source field: orientation.config_attribute_id") public static final SqlColumn configAttributeId = orientationRecord.configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.051+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.413+02:00", comments="Source field: orientation.template_id") public static final SqlColumn templateId = orientationRecord.templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.051+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.413+02:00", comments="Source field: orientation.view_id") public static final SqlColumn viewId = orientationRecord.viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.052+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.413+02:00", comments="Source field: orientation.group_id") public static final SqlColumn groupId = orientationRecord.groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.052+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.413+02:00", comments="Source field: orientation.x_position") public static final SqlColumn xPosition = orientationRecord.xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.052+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.413+02:00", comments="Source field: orientation.y_position") public static final SqlColumn yPosition = orientationRecord.yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.052+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source field: orientation.width") public static final SqlColumn width = orientationRecord.width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.052+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source field: orientation.height") public static final SqlColumn height = orientationRecord.height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.053+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source field: orientation.title") public static final SqlColumn title = orientationRecord.title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.050+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.413+02:00", comments="Source Table: orientation") public static final class OrientationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java index 080de677..d43311c7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface OrientationRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.053+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.053+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source Table: orientation") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.053+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source Table: orientation") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.053+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface OrientationRecordMapper { }) OrientationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.053+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -77,22 +77,22 @@ public interface OrientationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.053+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source Table: orientation") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.053+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source Table: orientation") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.054+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.414+02:00", comments="Source Table: orientation") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.054+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: orientation") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.054+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: orientation") default int insert(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -117,7 +117,7 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.054+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: orientation") default int insertSelective(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -134,19 +134,19 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.054+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.054+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.054+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: orientation") default OrientationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) .from(orientationRecord) @@ -155,7 +155,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.054+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: orientation") default UpdateDSL> updateByExample(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -169,7 +169,7 @@ public interface OrientationRecordMapper { .set(title).equalTo(record::getTitle); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.055+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: orientation") default UpdateDSL> updateByExampleSelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) @@ -183,7 +183,7 @@ public interface OrientationRecordMapper { .set(title).equalToWhenPresent(record::getTitle); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.055+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: orientation") default int updateByPrimaryKey(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -200,7 +200,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.055+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: orientation") default int updateByPrimaryKeySelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java index 6f788b3f..557d66b2 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java @@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class RoleRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.460+02:00", comments="Source Table: user_role") public static final RoleRecord roleRecord = new RoleRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.462+02:00", comments="Source field: user_role.id") public static final SqlColumn id = roleRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.462+02:00", comments="Source field: user_role.user_id") public static final SqlColumn userId = roleRecord.userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.463+02:00", comments="Source field: user_role.role_name") public static final SqlColumn roleName = roleRecord.roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.460+02:00", comments="Source Table: user_role") public static final class RoleRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java index 28ac8a45..f3b5c665 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface RoleRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.463+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.463+02:00", comments="Source Table: user_role") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.463+02:00", comments="Source Table: user_role") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.463+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -54,7 +54,7 @@ public interface RoleRecordMapper { }) RoleRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.463+02:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -63,22 +63,22 @@ public interface RoleRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.463+02:00", comments="Source Table: user_role") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.463+02:00", comments="Source Table: user_role") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.463+02:00", comments="Source Table: user_role") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.463+02:00", comments="Source Table: user_role") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord) .where(id, isEqualTo(id_)) @@ -86,7 +86,7 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.464+02:00", comments="Source Table: user_role") default int insert(RoleRecord record) { return insert(SqlBuilder.insert(record) .into(roleRecord) @@ -96,7 +96,7 @@ public interface RoleRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.134+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.464+02:00", comments="Source Table: user_role") default int insertSelective(RoleRecord record) { return insert(SqlBuilder.insert(record) .into(roleRecord) @@ -106,19 +106,19 @@ public interface RoleRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.135+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.464+02:00", comments="Source Table: user_role") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, userId, roleName) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.135+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.464+02:00", comments="Source Table: user_role") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userId, roleName) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.135+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.465+02:00", comments="Source Table: user_role") default RoleRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, userId, roleName) .from(roleRecord) @@ -127,21 +127,21 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.135+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.465+02:00", comments="Source Table: user_role") default UpdateDSL> updateByExample(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalTo(record::getUserId) .set(roleName).equalTo(record::getRoleName); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.135+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.465+02:00", comments="Source Table: user_role") default UpdateDSL> updateByExampleSelective(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalToWhenPresent(record::getUserId) .set(roleName).equalToWhenPresent(record::getRoleName); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.135+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.465+02:00", comments="Source Table: user_role") default int updateByPrimaryKey(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalTo(record::getUserId) @@ -151,7 +151,7 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.135+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.465+02:00", comments="Source Table: user_role") default int updateByPrimaryKeySelective(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalToWhenPresent(record::getUserId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java index a9b6d9af..31ca03de 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java @@ -7,34 +7,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class SebClientConfigRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.113+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source Table: seb_client_configuration") public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.113+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source field: seb_client_configuration.id") public static final SqlColumn id = sebClientConfigRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.113+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source field: seb_client_configuration.institution_id") public static final SqlColumn institutionId = sebClientConfigRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.114+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source field: seb_client_configuration.name") public static final SqlColumn name = sebClientConfigRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.114+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source field: seb_client_configuration.date") public static final SqlColumn date = sebClientConfigRecord.date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.114+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source field: seb_client_configuration.client_name") public static final SqlColumn clientName = sebClientConfigRecord.clientName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.114+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source field: seb_client_configuration.client_secret") public static final SqlColumn clientSecret = sebClientConfigRecord.clientSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.114+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source field: seb_client_configuration.encrypt_secret") public static final SqlColumn encryptSecret = sebClientConfigRecord.encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.114+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source field: seb_client_configuration.active") public static final SqlColumn active = sebClientConfigRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.113+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source Table: seb_client_configuration") public static final class SebClientConfigRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java index 9354cbbc..bfd9c05b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface SebClientConfigRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.114+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source Table: seb_client_configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source Table: seb_client_configuration") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface SebClientConfigRecordMapper { }) SebClientConfigRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.452+02:00", comments="Source Table: seb_client_configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface SebClientConfigRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default int insert(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -113,7 +113,7 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default int insertSelective(SebClientConfigRecord record) { return insert(SqlBuilder.insert(record) .into(sebClientConfigRecord) @@ -128,19 +128,19 @@ public interface SebClientConfigRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.115+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.116+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.116+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default SebClientConfigRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active) .from(sebClientConfigRecord) @@ -149,7 +149,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.116+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExample(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -161,7 +161,7 @@ public interface SebClientConfigRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.116+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default UpdateDSL> updateByExampleSelective(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -173,7 +173,7 @@ public interface SebClientConfigRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.116+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default int updateByPrimaryKey(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -188,7 +188,7 @@ public interface SebClientConfigRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.116+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.453+02:00", comments="Source Table: seb_client_configuration") default int updateByPrimaryKeySelective(SebClientConfigRecord record) { return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java index 3ee1330a..202f9664 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java @@ -7,22 +7,22 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ThresholdRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.100+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source Table: threshold") public static final ThresholdRecord thresholdRecord = new ThresholdRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.100+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source field: threshold.id") public static final SqlColumn id = thresholdRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.100+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source field: threshold.indicator_id") public static final SqlColumn indicatorId = thresholdRecord.indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source field: threshold.value") public static final SqlColumn value = thresholdRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source field: threshold.color") public static final SqlColumn color = thresholdRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.100+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source Table: threshold") public static final class ThresholdRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java index 8dcaf650..bf8cc316 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java @@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ThresholdRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source Table: threshold") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source Table: threshold") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface ThresholdRecordMapper { }) ThresholdRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source Table: threshold") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -66,22 +66,22 @@ public interface ThresholdRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source Table: threshold") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source Table: threshold") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.443+02:00", comments="Source Table: threshold") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.101+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.444+02:00", comments="Source Table: threshold") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord) .where(id, isEqualTo(id_)) @@ -89,7 +89,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.102+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.444+02:00", comments="Source Table: threshold") default int insert(ThresholdRecord record) { return insert(SqlBuilder.insert(record) .into(thresholdRecord) @@ -100,7 +100,7 @@ public interface ThresholdRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.102+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.444+02:00", comments="Source Table: threshold") default int insertSelective(ThresholdRecord record) { return insert(SqlBuilder.insert(record) .into(thresholdRecord) @@ -111,19 +111,19 @@ public interface ThresholdRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.102+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.444+02:00", comments="Source Table: threshold") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, indicatorId, value, color) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.102+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.444+02:00", comments="Source Table: threshold") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, indicatorId, value, color) .from(thresholdRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.102+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.444+02:00", comments="Source Table: threshold") default ThresholdRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, indicatorId, value, color) .from(thresholdRecord) @@ -132,7 +132,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.102+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.444+02:00", comments="Source Table: threshold") default UpdateDSL> updateByExample(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalTo(record::getIndicatorId) @@ -140,7 +140,7 @@ public interface ThresholdRecordMapper { .set(color).equalTo(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.102+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.444+02:00", comments="Source Table: threshold") default UpdateDSL> updateByExampleSelective(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalToWhenPresent(record::getIndicatorId) @@ -148,7 +148,7 @@ public interface ThresholdRecordMapper { .set(color).equalToWhenPresent(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.102+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.444+02:00", comments="Source Table: threshold") default int updateByPrimaryKey(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalTo(record::getIndicatorId) @@ -159,7 +159,7 @@ public interface ThresholdRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.103+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.444+02:00", comments="Source Table: threshold") default int updateByPrimaryKeySelective(ThresholdRecord record) { return UpdateDSL.updateWithMapper(this::update, thresholdRecord) .set(indicatorId).equalToWhenPresent(record::getIndicatorId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java index 8b60611d..fb55b6cf 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java @@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class UserActivityLogRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.138+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source Table: user_activity_log") public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.138+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.id") public static final SqlColumn id = userActivityLogRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.138+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.user_uuid") public static final SqlColumn userUuid = userActivityLogRecord.userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.138+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.timestamp") public static final SqlColumn timestamp = userActivityLogRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.138+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source field: user_activity_log.activity_type") public static final SqlColumn activityType = userActivityLogRecord.activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.139+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source field: user_activity_log.entity_type") public static final SqlColumn entityType = userActivityLogRecord.entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.139+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source field: user_activity_log.entity_id") public static final SqlColumn entityId = userActivityLogRecord.entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.139+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source field: user_activity_log.message") public static final SqlColumn message = userActivityLogRecord.message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.138+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source Table: user_activity_log") public static final class UserActivityLogRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java index 52dae983..43ad4c88 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface UserActivityLogRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.139+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.139+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface UserActivityLogRecordMapper { }) UserActivityLogRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface UserActivityLogRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") default int insert(UserActivityLogRecord record) { return insert(SqlBuilder.insert(record) .into(userActivityLogRecord) @@ -108,7 +108,7 @@ public interface UserActivityLogRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") default int insertSelective(UserActivityLogRecord record) { return insert(SqlBuilder.insert(record) .into(userActivityLogRecord) @@ -122,19 +122,19 @@ public interface UserActivityLogRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.470+02:00", comments="Source Table: user_activity_log") default UserActivityLogRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, userUuid, timestamp, activityType, entityType, entityId, message) .from(userActivityLogRecord) @@ -143,7 +143,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.471+02:00", comments="Source Table: user_activity_log") default UpdateDSL> updateByExample(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalTo(record::getUserUuid) @@ -154,7 +154,7 @@ public interface UserActivityLogRecordMapper { .set(message).equalTo(record::getMessage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.471+02:00", comments="Source Table: user_activity_log") default UpdateDSL> updateByExampleSelective(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalToWhenPresent(record::getUserUuid) @@ -165,7 +165,7 @@ public interface UserActivityLogRecordMapper { .set(message).equalToWhenPresent(record::getMessage); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.471+02:00", comments="Source Table: user_activity_log") default int updateByPrimaryKey(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalTo(record::getUserUuid) @@ -179,7 +179,7 @@ public interface UserActivityLogRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.140+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.471+02:00", comments="Source Table: user_activity_log") default int updateByPrimaryKeySelective(UserActivityLogRecord record) { return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) .set(userUuid).equalToWhenPresent(record::getUserUuid) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java index 3c4c16fb..9e623896 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java @@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class UserRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.130+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source Table: user") public static final UserRecord userRecord = new UserRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.130+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.id") public static final SqlColumn id = userRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.130+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.institution_id") public static final SqlColumn institutionId = userRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.130+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.uuid") public static final SqlColumn uuid = userRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.130+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.name") public static final SqlColumn name = userRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.130+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.username") public static final SqlColumn username = userRecord.username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.130+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.password") public static final SqlColumn password = userRecord.password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.131+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.email") public static final SqlColumn email = userRecord.email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.131+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source field: user.language") public static final SqlColumn language = userRecord.language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.131+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source field: user.timezone") public static final SqlColumn timezone = userRecord.timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.131+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source field: user.active") public static final SqlColumn active = userRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.130+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source Table: user") public static final class UserRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java index 91a54b1b..d25f1f81 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface UserRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.131+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.131+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.131+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.131+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface UserRecordMapper { }) UserRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -77,22 +77,22 @@ public interface UserRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default int insert(UserRecord record) { return insert(SqlBuilder.insert(record) .into(userRecord) @@ -117,7 +117,7 @@ public interface UserRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default int insertSelective(UserRecord record) { return insert(SqlBuilder.insert(record) .into(userRecord) @@ -134,19 +134,19 @@ public interface UserRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default UserRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, username, password, email, language, timezone, active) .from(userRecord) @@ -155,7 +155,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default UpdateDSL> updateByExample(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -169,7 +169,7 @@ public interface UserRecordMapper { .set(active).equalTo(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default UpdateDSL> updateByExampleSelective(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -183,7 +183,7 @@ public interface UserRecordMapper { .set(active).equalToWhenPresent(record::getActive); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.459+02:00", comments="Source Table: user") default int updateByPrimaryKey(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -200,7 +200,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.132+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.460+02:00", comments="Source Table: user") default int updateByPrimaryKeySelective(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java index 9346f4e3..8829d234 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java @@ -6,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ViewRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.043+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source Table: view") public static final ViewRecord viewRecord = new ViewRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.044+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source field: view.id") public static final SqlColumn id = viewRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.044+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source field: view.name") public static final SqlColumn name = viewRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.044+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source field: view.columns") public static final SqlColumn columns = viewRecord.columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.044+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source field: view.position") public static final SqlColumn position = viewRecord.position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.044+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source Table: view") public static final class ViewRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java index 1441d6cd..e9b08997 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ViewRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.045+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.045+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.045+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.045+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -55,7 +55,7 @@ public interface ViewRecordMapper { }) ViewRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.045+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,22 +65,22 @@ public interface ViewRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.045+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.045+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.046+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.046+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord) .where(id, isEqualTo(id_)) @@ -88,7 +88,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.046+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") default int insert(ViewRecord record) { return insert(SqlBuilder.insert(record) .into(viewRecord) @@ -99,7 +99,7 @@ public interface ViewRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.046+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") default int insertSelective(ViewRecord record) { return insert(SqlBuilder.insert(record) .into(viewRecord) @@ -110,19 +110,19 @@ public interface ViewRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.046+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, columns, position) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.046+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, columns, position) .from(viewRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.046+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") default ViewRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, columns, position) .from(viewRecord) @@ -131,7 +131,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.047+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.410+02:00", comments="Source Table: view") default UpdateDSL> updateByExample(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalTo(record::getName) @@ -139,7 +139,7 @@ public interface ViewRecordMapper { .set(position).equalTo(record::getPosition); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.047+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.411+02:00", comments="Source Table: view") default UpdateDSL> updateByExampleSelective(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalToWhenPresent(record::getName) @@ -147,7 +147,7 @@ public interface ViewRecordMapper { .set(position).equalToWhenPresent(record::getPosition); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.047+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.411+02:00", comments="Source Table: view") default int updateByPrimaryKey(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalTo(record::getName) @@ -158,7 +158,7 @@ public interface ViewRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.047+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.411+02:00", comments="Source Table: view") default int updateByPrimaryKeySelective(ViewRecord record) { return UpdateDSL.updateWithMapper(this::update, viewRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java index a7de065a..6ab7b4eb 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java @@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class AdditionalAttributes { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.142+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.472+02:00", comments="Source field: additional_attributes.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.142+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.142+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.entity_id") private Long entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.142+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.142+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.141+02:00", comments="Source Table: additional_attributes") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.471+02:00", comments="Source Table: additional_attributes") public AdditionalAttributes(Long id, String entityType, Long entityId, String name, String value) { this.id = id; this.entityType = entityType; @@ -27,27 +27,27 @@ public class AdditionalAttributes { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.142+02:00", comments="Source field: additional_attributes.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.142+02:00", comments="Source field: additional_attributes.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.142+02:00", comments="Source field: additional_attributes.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.entity_id") public Long getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.142+02:00", comments="Source field: additional_attributes.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.142+02:00", comments="Source field: additional_attributes.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.473+02:00", comments="Source field: additional_attributes.value") public String getValue() { return value; } @@ -56,7 +56,7 @@ public class AdditionalAttributes { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class AdditionalAttributes { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class AdditionalAttributes { * This method was generated by MyBatis Generator. * This method corresponds to the database table additional_attributes * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java index fd5cfd69..2eedb154 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java @@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ClientConnectionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.user_name") private String userName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.vdi") private Boolean vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.085+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source field: client_connection.client_address") private String clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.085+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source field: client_connection.virtual_client_address") private String virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source Table: client_connection") public ClientConnectionRecord(Long id, Long examId, String status, String connectionToken, String userName, Boolean vdi, String clientAddress, String virtualClientAddress) { this.id = id; this.examId = examId; @@ -39,42 +39,42 @@ public class ClientConnectionRecord { this.virtualClientAddress = virtualClientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.084+02:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.434+02:00", comments="Source field: client_connection.user_name") public String getUserName() { return userName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.085+02:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source field: client_connection.vdi") public Boolean getVdi() { return vdi; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.085+02:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source field: client_connection.client_address") public String getClientAddress() { return clientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.085+02:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.435+02:00", comments="Source field: client_connection.virtual_client_address") public String getVirtualClientAddress() { return virtualClientAddress; } @@ -83,7 +83,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java index 2f712cf8..75685984 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java @@ -4,28 +4,28 @@ import java.math.BigDecimal; import javax.annotation.Generated; public class ClientEventRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.090+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.090+02:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.connection_id") private Long connectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.090+02:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.user_identifier") private String userIdentifier; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.090+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.091+02:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.091+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.numeric_value") private BigDecimal numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.091+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.090+02:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source Table: client_event") public ClientEventRecord(Long id, Long connectionId, String userIdentifier, Integer type, Long timestamp, BigDecimal numericValue, String text) { this.id = id; this.connectionId = connectionId; @@ -36,37 +36,37 @@ public class ClientEventRecord { this.text = text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.090+02:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.090+02:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.connection_id") public Long getConnectionId() { return connectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.090+02:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.user_identifier") public String getUserIdentifier() { return userIdentifier; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.091+02:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.091+02:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.091+02:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.437+02:00", comments="Source field: client_event.numeric_value") public BigDecimal getNumericValue() { return numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.091+02:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.438+02:00", comments="Source field: client_event.text") public String getText() { return text; } @@ -75,7 +75,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -98,7 +98,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -125,7 +125,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java index 68d5c844..1871ea31 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java @@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ConfigurationAttributeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.717+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.262+02:00", comments="Source field: configuration_attribute.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.718+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.718+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.719+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.parent_id") private Long parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.719+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.resources") private String resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.719+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.validator") private String validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.719+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.dependencies") private String dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.720+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.264+02:00", comments="Source field: configuration_attribute.default_value") private String defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.702+02:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.256+02:00", comments="Source Table: configuration_attribute") public ConfigurationAttributeRecord(Long id, String name, String type, Long parentId, String resources, String validator, String dependencies, String defaultValue) { this.id = id; this.name = name; @@ -39,42 +39,42 @@ public class ConfigurationAttributeRecord { this.defaultValue = defaultValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.718+02:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.718+02:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.718+02:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.719+02:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.parent_id") public Long getParentId() { return parentId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.719+02:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.resources") public String getResources() { return resources; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.719+02:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.263+02:00", comments="Source field: configuration_attribute.validator") public String getValidator() { return validator; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.719+02:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.264+02:00", comments="Source field: configuration_attribute.dependencies") public String getDependencies() { return dependencies; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:57.720+02:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.264+02:00", comments="Source field: configuration_attribute.default_value") public String getDefaultValue() { return defaultValue; } @@ -83,7 +83,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Fri May 24 11:57:57 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Fri May 24 11:57:57 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Fri May 24 11:57:57 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java index eed296df..7441b49d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java @@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ConfigurationNodeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.063+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.419+02:00", comments="Source field: configuration_node.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.063+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.419+02:00", comments="Source field: configuration_node.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.063+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.419+02:00", comments="Source field: configuration_node.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.063+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.419+02:00", comments="Source field: configuration_node.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.064+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.064+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.064+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.064+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.063+02:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.419+02:00", comments="Source Table: configuration_node") public ConfigurationNodeRecord(Long id, Long institutionId, Long templateId, String owner, String name, String description, String type, String status) { this.id = id; this.institutionId = institutionId; @@ -39,42 +39,42 @@ public class ConfigurationNodeRecord { this.status = status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.063+02:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.419+02:00", comments="Source field: configuration_node.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.063+02:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.419+02:00", comments="Source field: configuration_node.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.063+02:00", comments="Source field: configuration_node.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.419+02:00", comments="Source field: configuration_node.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.064+02:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.064+02:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.064+02:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.064+02:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.064+02:00", comments="Source field: configuration_node.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.420+02:00", comments="Source field: configuration_node.status") public String getStatus() { return status; } @@ -83,7 +83,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java index 1ea73be5..43098533 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java @@ -4,25 +4,25 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class ConfigurationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.057+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source field: configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.057+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.057+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.058+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.version") private String version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.058+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.version_date") private DateTime versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.058+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.followup") private Integer followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.057+02:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.415+02:00", comments="Source Table: configuration") public ConfigurationRecord(Long id, Long institutionId, Long configurationNodeId, String version, DateTime versionDate, Integer followup) { this.id = id; this.institutionId = institutionId; @@ -32,32 +32,32 @@ public class ConfigurationRecord { this.followup = followup; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.057+02:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.057+02:00", comments="Source field: configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.057+02:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.058+02:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.version") public String getVersion() { return version; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.058+02:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.version_date") public DateTime getVersionDate() { return versionDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.058+02:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.416+02:00", comments="Source field: configuration.followup") public Integer getFollowup() { return followup; } @@ -66,7 +66,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -88,7 +88,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -114,7 +114,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java index fdea3e1c..4760cf37 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ConfigurationValueRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.034+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.034+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.035+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.configuration_id") private Long configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.035+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.configuration_attribute_id") private Long configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.035+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.list_index") private Integer listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.035+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.034+02:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source Table: configuration_value") public ConfigurationValueRecord(Long id, Long institutionId, Long configurationId, Long configurationAttributeId, Integer listIndex, String value) { this.id = id; this.institutionId = institutionId; @@ -31,32 +31,32 @@ public class ConfigurationValueRecord { this.value = value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.034+02:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.035+02:00", comments="Source field: configuration_value.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.035+02:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.configuration_id") public Long getConfigurationId() { return configurationId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.035+02:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.configuration_attribute_id") public Long getConfigurationAttributeId() { return configurationAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.035+02:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.list_index") public Integer getListIndex() { return listIndex; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.035+02:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.406+02:00", comments="Source field: configuration_value.value") public String getValue() { return value; } @@ -65,7 +65,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java index 16f0e9c2..7880584e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java @@ -3,60 +3,69 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamConfigurationMapRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.071+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.072+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.072+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.072+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.072+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.user_names") private String userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.071+02:00", comments="Source Table: exam_configuration_map") - public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String userNames) { + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + private String encryptSecret; + + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.424+02:00", comments="Source Table: exam_configuration_map") + public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String userNames, String encryptSecret) { this.id = id; this.institutionId = institutionId; this.examId = examId; this.configurationNodeId = configurationNodeId; this.userNames = userNames; + this.encryptSecret = encryptSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.071+02:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.072+02:00", comments="Source field: exam_configuration_map.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.072+02:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.072+02:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.072+02:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.user_names") public String getUserNames() { return userNames; } + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.425+02:00", comments="Source field: exam_configuration_map.encrypt_secret") + public String getEncryptSecret() { + return encryptSecret; + } + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -69,6 +78,7 @@ public class ExamConfigurationMapRecord { sb.append(", examId=").append(examId); sb.append(", configurationNodeId=").append(configurationNodeId); sb.append(", userNames=").append(userNames); + sb.append(", encryptSecret=").append(encryptSecret); sb.append("]"); return sb.toString(); } @@ -77,7 +87,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -95,14 +105,15 @@ public class ExamConfigurationMapRecord { && (this.getInstitutionId() == null ? other.getInstitutionId() == null : this.getInstitutionId().equals(other.getInstitutionId())) && (this.getExamId() == null ? other.getExamId() == null : this.getExamId().equals(other.getExamId())) && (this.getConfigurationNodeId() == null ? other.getConfigurationNodeId() == null : this.getConfigurationNodeId().equals(other.getConfigurationNodeId())) - && (this.getUserNames() == null ? other.getUserNames() == null : this.getUserNames().equals(other.getUserNames())); + && (this.getUserNames() == null ? other.getUserNames() == null : this.getUserNames().equals(other.getUserNames())) + && (this.getEncryptSecret() == null ? other.getEncryptSecret() == null : this.getEncryptSecret().equals(other.getEncryptSecret())); } /** * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { @@ -113,6 +124,7 @@ public class ExamConfigurationMapRecord { result = prime * result + ((getExamId() == null) ? 0 : getExamId().hashCode()); result = prime * result + ((getConfigurationNodeId() == null) ? 0 : getConfigurationNodeId().hashCode()); result = prime * result + ((getUserNames() == null) ? 0 : getUserNames().hashCode()); + result = prime * result + ((getEncryptSecret() == null) ? 0 : getEncryptSecret().hashCode()); return result; } } \ No newline at end of file diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java index 6a4ede71..56692709 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java @@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ExamRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.429+02:00", comments="Source field: exam.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.lms_setup_id") private Long lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.external_id") private String externalId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.079+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.079+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.079+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.quit_password") private String quitPassword; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.079+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.browser_keys") private String browserKeys; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.079+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.429+02:00", comments="Source Table: exam") public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String quitPassword, String browserKeys, Integer active) { this.id = id; this.institutionId = institutionId; @@ -47,52 +47,52 @@ public class ExamRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.429+02:00", comments="Source field: exam.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source field: exam.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.lms_setup_id") public Long getLmsSetupId() { return lmsSetupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source field: exam.external_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.external_id") public String getExternalId() { return externalId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.078+02:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.079+02:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.079+02:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.079+02:00", comments="Source field: exam.quit_password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.quit_password") public String getQuitPassword() { return quitPassword; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.079+02:00", comments="Source field: exam.browser_keys") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.browser_keys") public String getBrowserKeys() { return browserKeys; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.079+02:00", comments="Source field: exam.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.430+02:00", comments="Source field: exam.active") public Integer getActive() { return active; } @@ -101,7 +101,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java index f26e3992..711e93f2 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java @@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class IndicatorRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.095+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.096+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.096+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.096+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.096+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.095+02:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.439+02:00", comments="Source Table: indicator") public IndicatorRecord(Long id, Long examId, String type, String name, String color) { this.id = id; this.examId = examId; @@ -27,27 +27,27 @@ public class IndicatorRecord { this.color = color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.096+02:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.096+02:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.096+02:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.096+02:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.096+02:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.440+02:00", comments="Source field: indicator.color") public String getColor() { return color; } @@ -56,7 +56,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java index 998b3de6..9d4fa3ad 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java @@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class InstitutionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.105+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source field: institution.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.105+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source field: institution.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.105+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source field: institution.url_suffix") private String urlSuffix; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.105+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source field: institution.theme_name") private String themeName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.105+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source field: institution.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.106+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.447+02:00", comments="Source field: institution.logo_image") private String logoImage; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.105+02:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source Table: institution") public InstitutionRecord(Long id, String name, String urlSuffix, String themeName, Integer active, String logoImage) { this.id = id; this.name = name; @@ -31,32 +31,32 @@ public class InstitutionRecord { this.logoImage = logoImage; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.105+02:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source field: institution.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.105+02:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source field: institution.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.105+02:00", comments="Source field: institution.url_suffix") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source field: institution.url_suffix") public String getUrlSuffix() { return urlSuffix; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.105+02:00", comments="Source field: institution.theme_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source field: institution.theme_name") public String getThemeName() { return themeName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.106+02:00", comments="Source field: institution.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.446+02:00", comments="Source field: institution.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.106+02:00", comments="Source field: institution.logo_image") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.447+02:00", comments="Source field: institution.logo_image") public String getLogoImage() { return logoImage; } @@ -65,7 +65,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java index 09e1a998..f11ecafb 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java @@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class LmsSetupRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.117+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.117+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.117+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.117+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.lms_type") private String lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.117+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.lms_url") private String lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.118+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.lms_clientname") private String lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.118+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.lms_clientsecret") private String lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.118+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.lms_rest_api_token") private String lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.118+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.117+02:00", comments="Source Table: lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source Table: lms_setup") public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, Integer active) { this.id = id; this.institutionId = institutionId; @@ -43,47 +43,47 @@ public class LmsSetupRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.117+02:00", comments="Source field: lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.117+02:00", comments="Source field: lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.117+02:00", comments="Source field: lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.117+02:00", comments="Source field: lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.lms_type") public String getLmsType() { return lmsType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.118+02:00", comments="Source field: lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.lms_url") public String getLmsUrl() { return lmsUrl; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.118+02:00", comments="Source field: lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.lms_clientname") public String getLmsClientname() { return lmsClientname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.118+02:00", comments="Source field: lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.lms_clientsecret") public String getLmsClientsecret() { return lmsClientsecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.118+02:00", comments="Source field: lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.lms_rest_api_token") public String getLmsRestApiToken() { return lmsRestApiToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.118+02:00", comments="Source field: lms_setup.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.454+02:00", comments="Source field: lms_setup.active") public Integer getActive() { return active; } @@ -92,7 +92,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class LmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table lms_setup * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java index 1ae3bd40..5e150da3 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java @@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class OrientationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.048+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.411+02:00", comments="Source field: orientation.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.048+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.411+02:00", comments="Source field: orientation.config_attribute_id") private Long configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.048+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.411+02:00", comments="Source field: orientation.template_id") private Long templateId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.048+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.view_id") private Long viewId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.group_id") private String groupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.x_position") private Integer xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.y_position") private Integer yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.width") private Integer width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.height") private Integer height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.title") private String title; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.048+02:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.411+02:00", comments="Source Table: orientation") public OrientationRecord(Long id, Long configAttributeId, Long templateId, Long viewId, String groupId, Integer xPosition, Integer yPosition, Integer width, Integer height, String title) { this.id = id; this.configAttributeId = configAttributeId; @@ -47,52 +47,52 @@ public class OrientationRecord { this.title = title; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.048+02:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.411+02:00", comments="Source field: orientation.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.048+02:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.411+02:00", comments="Source field: orientation.config_attribute_id") public Long getConfigAttributeId() { return configAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.048+02:00", comments="Source field: orientation.template_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.template_id") public Long getTemplateId() { return templateId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.048+02:00", comments="Source field: orientation.view_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.view_id") public Long getViewId() { return viewId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.group_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.group_id") public String getGroupId() { return groupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.x_position") public Integer getxPosition() { return xPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.y_position") public Integer getyPosition() { return yPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.width") public Integer getWidth() { return width; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.049+02:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.height") public Integer getHeight() { return height; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.050+02:00", comments="Source field: orientation.title") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.412+02:00", comments="Source field: orientation.title") public String getTitle() { return title; } @@ -101,7 +101,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java index 7d0456fb..21a746fe 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java @@ -3,33 +3,33 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class RoleRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.133+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.460+02:00", comments="Source field: user_role.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.133+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.460+02:00", comments="Source field: user_role.user_id") private Long userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.133+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.460+02:00", comments="Source field: user_role.role_name") private String roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.133+02:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.460+02:00", comments="Source Table: user_role") public RoleRecord(Long id, Long userId, String roleName) { this.id = id; this.userId = userId; this.roleName = roleName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.133+02:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.460+02:00", comments="Source field: user_role.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.133+02:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.460+02:00", comments="Source field: user_role.user_id") public Long getUserId() { return userId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.133+02:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.460+02:00", comments="Source field: user_role.role_name") public String getRoleName() { return roleName; } @@ -38,7 +38,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -57,7 +57,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -80,7 +80,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java index 4355b41a..db5c2905 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java @@ -4,31 +4,31 @@ import javax.annotation.Generated; import org.joda.time.DateTime; public class SebClientConfigRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.111+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.date") private DateTime date; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.client_name") private String clientName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.client_secret") private String clientSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.encrypt_secret") private String encryptSecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.111+02:00", comments="Source Table: seb_client_configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source Table: seb_client_configuration") public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, String encryptSecret, Integer active) { this.id = id; this.institutionId = institutionId; @@ -40,42 +40,42 @@ public class SebClientConfigRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.date") public DateTime getDate() { return date; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.client_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.client_name") public String getClientName() { return clientName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.client_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.client_secret") public String getClientSecret() { return clientSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.encrypt_secret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.encrypt_secret") public String getEncryptSecret() { return encryptSecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.112+02:00", comments="Source field: seb_client_configuration.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.451+02:00", comments="Source field: seb_client_configuration.active") public Integer getActive() { return active; } @@ -84,7 +84,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -108,7 +108,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -136,7 +136,7 @@ public class SebClientConfigRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_client_configuration * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java index bd129374..e9a356bc 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java @@ -4,19 +4,19 @@ import java.math.BigDecimal; import javax.annotation.Generated; public class ThresholdRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.099+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source field: threshold.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.099+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source field: threshold.indicator_id") private Long indicatorId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.100+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source field: threshold.value") private BigDecimal value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.100+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source field: threshold.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.099+02:00", comments="Source Table: threshold") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.441+02:00", comments="Source Table: threshold") public ThresholdRecord(Long id, Long indicatorId, BigDecimal value, String color) { this.id = id; this.indicatorId = indicatorId; @@ -24,22 +24,22 @@ public class ThresholdRecord { this.color = color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.099+02:00", comments="Source field: threshold.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source field: threshold.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.099+02:00", comments="Source field: threshold.indicator_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source field: threshold.indicator_id") public Long getIndicatorId() { return indicatorId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.100+02:00", comments="Source field: threshold.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source field: threshold.value") public BigDecimal getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.100+02:00", comments="Source field: threshold.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.442+02:00", comments="Source field: threshold.color") public String getColor() { return color; } @@ -48,7 +48,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -68,7 +68,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -92,7 +92,7 @@ public class ThresholdRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table threshold * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java index 73598aeb..94fa4cd4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java @@ -3,28 +3,28 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class UserActivityLogRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.468+02:00", comments="Source field: user_activity_log.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.468+02:00", comments="Source field: user_activity_log.user_uuid") private String userUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.468+02:00", comments="Source field: user_activity_log.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.activity_type") private String activityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.entity_type") private String entityType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.entity_id") private String entityId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.message") private String message; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source Table: user_activity_log") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.468+02:00", comments="Source Table: user_activity_log") public UserActivityLogRecord(Long id, String userUuid, Long timestamp, String activityType, String entityType, String entityId, String message) { this.id = id; this.userUuid = userUuid; @@ -35,37 +35,37 @@ public class UserActivityLogRecord { this.message = message; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.468+02:00", comments="Source field: user_activity_log.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.user_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.468+02:00", comments="Source field: user_activity_log.user_uuid") public String getUserUuid() { return userUuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.468+02:00", comments="Source field: user_activity_log.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.activity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.activity_type") public String getActivityType() { return activityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.entity_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.entity_type") public String getEntityType() { return entityType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.entity_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.entity_id") public String getEntityId() { return entityId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.137+02:00", comments="Source field: user_activity_log.message") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.469+02:00", comments="Source field: user_activity_log.message") public String getMessage() { return message; } @@ -74,7 +74,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -97,7 +97,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -124,7 +124,7 @@ public class UserActivityLogRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_activity_log * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java index cf4ce969..0e67a5fc 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java @@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class UserRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.username") private String username; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.password") private String password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.email") private String email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.language") private String language; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.timezone") private String timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source Table: user") public UserRecord(Long id, Long institutionId, String uuid, String name, String username, String password, String email, String language, String timezone, Integer active) { this.id = id; this.institutionId = institutionId; @@ -47,52 +47,52 @@ public class UserRecord { this.active = active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.username") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.username") public String getUsername() { return username; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.457+02:00", comments="Source field: user.password") public String getPassword() { return password; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.email") public String getEmail() { return email; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.language") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.language") public String getLanguage() { return language; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.timezone") public String getTimezone() { return timezone; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.129+02:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.458+02:00", comments="Source field: user.active") public Integer getActive() { return active; } @@ -101,7 +101,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java index 78da3eaa..34233b0b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java @@ -3,19 +3,19 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model; import javax.annotation.Generated; public class ViewRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.043+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source field: view.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.043+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source field: view.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.043+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source field: view.columns") private Integer columns; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.043+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source field: view.position") private Integer position; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.042+02:00", comments="Source Table: view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source Table: view") public ViewRecord(Long id, String name, Integer columns, Integer position) { this.id = id; this.name = name; @@ -23,22 +23,22 @@ public class ViewRecord { this.position = position; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.043+02:00", comments="Source field: view.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source field: view.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.043+02:00", comments="Source field: view.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source field: view.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.043+02:00", comments="Source field: view.columns") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source field: view.columns") public Integer getColumns() { return columns; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-24T11:57:58.043+02:00", comments="Source field: view.position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-05-27T08:45:56.409+02:00", comments="Source field: view.position") public Integer getPosition() { return position; } @@ -47,7 +47,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public String toString() { @@ -67,7 +67,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public boolean equals(Object that) { @@ -91,7 +91,7 @@ public class ViewRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table view * - * @mbg.generated Fri May 24 11:57:58 CEST 2019 + * @mbg.generated Mon May 27 08:45:56 CEST 2019 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java index 1d907fa0..8bdc1781 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java @@ -25,6 +25,8 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import ch.ethz.seb.sebserver.gbl.api.API.BulkActionType; +import ch.ethz.seb.sebserver.gbl.api.APIMessage.APIMessageException; +import ch.ethz.seb.sebserver.gbl.api.APIMessage.ErrorMessage; import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ExamConfigurationMap; @@ -39,6 +41,7 @@ import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ConfigurationNodeR import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ExamConfigurationMapRecord; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ExamRecord; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkAction; +import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentialService; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.DAOLoggingSupport; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ExamConfigurationMapDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.FilterMap; @@ -53,15 +56,18 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { private final ExamRecordMapper examRecordMapper; private final ExamConfigurationMapRecordMapper examConfigurationMapRecordMapper; private final ConfigurationNodeRecordMapper configurationNodeRecordMapper; + private final ClientCredentialService clientCredentialService; protected ExamConfigurationMapDAOImpl( final ExamRecordMapper examRecordMapper, final ExamConfigurationMapRecordMapper examConfigurationMapRecordMapper, - final ConfigurationNodeRecordMapper configurationNodeRecordMapper) { + final ConfigurationNodeRecordMapper configurationNodeRecordMapper, + final ClientCredentialService clientCredentialService) { this.examRecordMapper = examRecordMapper; this.examConfigurationMapRecordMapper = examConfigurationMapRecordMapper; this.configurationNodeRecordMapper = configurationNodeRecordMapper; + this.clientCredentialService = clientCredentialService; } @Override @@ -127,7 +133,8 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { data.institutionId, data.examId, data.configurationNodeId, - data.userNames); + data.userNames, + getEncryptionPassword(data)); this.examConfigurationMapRecordMapper.insert(newRecord); return newRecord; @@ -146,7 +153,8 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { null, null, null, - data.userNames); + data.userNames, + getEncryptionPassword(data)); this.examConfigurationMapRecordMapper.updateByPrimaryKeySelective(newRecord); return this.examConfigurationMapRecordMapper.selectByPrimaryKey(data.id); @@ -221,7 +229,9 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { record.getInstitutionId(), record.getExamId(), record.getConfigurationNodeId(), - record.getUserNames())); + record.getUserNames(), + null, + null)); } private Result checkMappingIntegrity(final ExamConfigurationMap data) { @@ -316,4 +326,16 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { }); } + private String getEncryptionPassword(final ExamConfigurationMap examConfigurationMap) { + if (examConfigurationMap.hasEncryptionSecret() && + !examConfigurationMap.encryptSecret.equals(examConfigurationMap.confirmEncryptSecret)) { + throw new APIMessageException(ErrorMessage.PASSWORD_MISMATCH); + } + + final CharSequence encrypted_encrypt_secret = examConfigurationMap.hasEncryptionSecret() + ? this.clientCredentialService.encrypt(examConfigurationMap.encryptSecret) + : null; + return (encrypted_encrypt_secret != null) ? encrypted_encrypt_secret.toString() : null; + } + } diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 42c5cb8e..6732e023 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -355,10 +355,10 @@ sebserver.examconfig.info.pleaseSelect=Please Select an exam configuration first sebserver.examconfig.action.list.new=New Exam Configuration sebserver.examconfig.action.list.view=View Configuration -sebserver.examconfig.action.list.modify=Edit -sebserver.examconfig.action.list.modify.properties=Edit Properties -sebserver.examconfig.action.modify=Edit -sebserver.examconfig.action.modify.properties=Edit Properties +sebserver.examconfig.action.list.modify=Edit Settings +sebserver.examconfig.action.list.modify.properties=Edit Configuration +sebserver.examconfig.action.modify=Edit Settings +sebserver.examconfig.action.modify.properties=Edit Configuration sebserver.examconfig.action.save=Save sebserver.examconfig.action.saveToHistory=Save In History sebserver.examconfig.action.saveToHistory.success=Successfully saved in history diff --git a/src/main/resources/schema-demo.sql b/src/main/resources/schema-demo.sql index 7ad39f6d..0db7d8c0 100644 --- a/src/main/resources/schema-demo.sql +++ b/src/main/resources/schema-demo.sql @@ -312,6 +312,7 @@ CREATE TABLE IF NOT EXISTS `exam_configuration_map` ( `exam_id` BIGINT UNSIGNED NOT NULL, `configuration_node_id` BIGINT UNSIGNED NOT NULL, `user_names` VARCHAR(4000) NULL, + `encrypt_secret` VARCHAR(255) NULL, PRIMARY KEY (`id`), INDEX `exam_ref_idx` (`exam_id` ASC), INDEX `configuration_map_ref_idx` (`configuration_node_id` ASC), diff --git a/src/main/resources/schema-dev.sql b/src/main/resources/schema-dev.sql index 1cd2185f..ca7ff137 100644 --- a/src/main/resources/schema-dev.sql +++ b/src/main/resources/schema-dev.sql @@ -320,6 +320,7 @@ CREATE TABLE IF NOT EXISTS `exam_configuration_map` ( `exam_id` BIGINT UNSIGNED NOT NULL, `configuration_node_id` BIGINT UNSIGNED NOT NULL, `user_names` VARCHAR(4000) NULL, + `encrypt_secret` VARCHAR(255) NULL, PRIMARY KEY (`id`), INDEX `exam_ref_idx` (`exam_id` ASC), INDEX `configuration_map_ref_idx` (`configuration_node_id` ASC), diff --git a/src/test/resources/schema-test.sql b/src/test/resources/schema-test.sql index 7ad39f6d..0db7d8c0 100644 --- a/src/test/resources/schema-test.sql +++ b/src/test/resources/schema-test.sql @@ -312,6 +312,7 @@ CREATE TABLE IF NOT EXISTS `exam_configuration_map` ( `exam_id` BIGINT UNSIGNED NOT NULL, `configuration_node_id` BIGINT UNSIGNED NOT NULL, `user_names` VARCHAR(4000) NULL, + `encrypt_secret` VARCHAR(255) NULL, PRIMARY KEY (`id`), INDEX `exam_ref_idx` (`exam_id` ASC), INDEX `configuration_map_ref_idx` (`configuration_node_id` ASC), From a57f937724553ab33e61a0d30386c23ba58d5130 Mon Sep 17 00:00:00 2001 From: anhefti Date: Mon, 27 May 2019 16:29:09 +0200 Subject: [PATCH 3/6] SEBSERV-44 SEBSERV-45 Exam - SEB Configuration mapping implementation --- .../ExamConfigurationMap.java | 68 +++++- .../sebserver/gbl/model/exam/Indicator.java | 2 +- .../seb/sebserver/gui/content/ExamForm.java | 163 +++++++++++--- .../gui/content/ExamSebConfigMapForm.java | 212 ++++++++++++++++++ .../sebserver/gui/content/IndicatorForm.java | 11 +- .../gui/content/SebExamConfigList.java | 24 +- .../gui/content/SebExamConfigPropForm.java | 3 +- .../gui/content/action/ActionCategory.java | 3 +- .../gui/content/action/ActionDefinition.java | 35 ++- .../gui/content/action/ActionPane.java | 8 +- .../content/activity/PageStateDefinition.java | 2 + .../ch/ethz/seb/sebserver/gui/form/Form.java | 25 +++ .../seb/sebserver/gui/form/FormBuilder.java | 2 +- .../gui/service/ResourceService.java | 66 +++++- .../examconfig/impl/TableFieldBuilder.java | 4 +- .../api/exam/DeleteExamConfigMapping.java | 39 ++++ .../api/exam/GetExamConfigMapping.java | 40 ++++ .../api/exam/GetExamConfigMappingNames.java | 42 ++++ .../api/exam/GetExamConfigMappingsPage.java | 41 ++++ .../api/exam/NewExamConfigMapping.java | 40 ++++ .../api/exam/SaveExamConfigMapping.java | 40 ++++ .../seb/sebserver/gui/table/EntityTable.java | 21 +- .../gui/widget/PopupListSelection.java | 17 ++ .../sebserver/gui/widget/WidgetFactory.java | 4 + .../dao/ExamConfigurationMapDAO.java | 2 +- .../servicelayer/dao/FilterMap.java | 4 +- .../dao/impl/ConfigurationNodeDAOImpl.java | 2 +- .../dao/impl/ExamConfigurationMapDAOImpl.java | 42 ++-- .../weblayer/api/EntityController.java | 2 +- .../ExamConfigurationMappingController.java | 121 ++++++++++ src/main/resources/messages.properties | 28 ++- src/main/resources/messages_en.properties | 9 +- src/main/resources/static/images/no.png | Bin 0 -> 148 bytes src/main/resources/static/images/settings.png | Bin 0 -> 218 bytes src/main/resources/static/images/undo.png | Bin 0 -> 174 bytes src/main/resources/static/images/yes.png | Bin 0 -> 132 bytes 36 files changed, 1011 insertions(+), 111 deletions(-) rename src/main/java/ch/ethz/seb/sebserver/gbl/model/{sebconfig => exam}/ExamConfigurationMap.java (57%) create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/content/ExamSebConfigMapForm.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/DeleteExamConfigMapping.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMapping.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMappingNames.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMappingsPage.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/NewExamConfigMapping.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/SaveExamConfigMapping.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/widget/PopupListSelection.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamConfigurationMappingController.java create mode 100644 src/main/resources/static/images/no.png create mode 100644 src/main/resources/static/images/settings.png create mode 100644 src/main/resources/static/images/undo.png create mode 100644 src/main/resources/static/images/yes.png diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/ExamConfigurationMap.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamConfigurationMap.java similarity index 57% rename from src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/ExamConfigurationMap.java rename to src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamConfigurationMap.java index 1e537d71..07994e52 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/ExamConfigurationMap.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/ExamConfigurationMap.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.gbl.model.sebconfig; +package ch.ethz.seb.sebserver.gbl.model.exam; import javax.validation.constraints.NotNull; @@ -16,9 +16,12 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.api.POSTMapper; +import ch.ethz.seb.sebserver.gbl.model.Domain; +import ch.ethz.seb.sebserver.gbl.model.Domain.CONFIGURATION_NODE; import ch.ethz.seb.sebserver.gbl.model.Domain.EXAM_CONFIGURATION_MAP; -import ch.ethz.seb.sebserver.gbl.model.Domain.SEB_CLIENT_CONFIGURATION; import ch.ethz.seb.sebserver.gbl.model.GrantEntity; +import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationStatus; @JsonIgnoreProperties(ignoreUnknown = true) public final class ExamConfigurationMap implements GrantEntity { @@ -35,14 +38,23 @@ public final class ExamConfigurationMap implements GrantEntity { @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_INSTITUTION_ID) public final Long institutionId; - @NotNull + @NotNull(message = "examConfigurationMap:examId:notNull") @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_EXAM_ID) public final Long examId; - @NotNull + @NotNull(message = "examConfigurationMap:configurationNodeId:notNull") @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_CONFIGURATION_NODE_ID) public final Long configurationNodeId; + @JsonProperty(CONFIGURATION_NODE.ATTR_NAME) + public final String configName; + + @JsonProperty(CONFIGURATION_NODE.ATTR_DESCRIPTION) + public final String configDescription; + + @JsonProperty(CONFIGURATION_NODE.ATTR_STATUS) + public final ConfigurationStatus configStatus; + @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_USER_NAMES) public final String userNames; @@ -59,8 +71,12 @@ public final class ExamConfigurationMap implements GrantEntity { @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_EXAM_ID) final Long examId, @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_CONFIGURATION_NODE_ID) final Long configurationNodeId, @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_USER_NAMES) final String userNames, - @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET) final CharSequence encryptSecret, - @JsonProperty(ATTR_CONFIRM_ENCRYPT_SECRET) final CharSequence confirmEncryptSecret) { + @JsonProperty(EXAM_CONFIGURATION_MAP.ATTR_ENCRYPT_SECRET) final CharSequence encryptSecret, + @JsonProperty(ATTR_CONFIRM_ENCRYPT_SECRET) final CharSequence confirmEncryptSecret, + + @JsonProperty(CONFIGURATION_NODE.ATTR_NAME) final String configName, + @JsonProperty(CONFIGURATION_NODE.ATTR_DESCRIPTION) final String configDescription, + @JsonProperty(CONFIGURATION_NODE.ATTR_STATUS) final ConfigurationStatus configStatus) { this.id = id; this.institutionId = institutionId; @@ -69,6 +85,24 @@ public final class ExamConfigurationMap implements GrantEntity { this.userNames = userNames; this.encryptSecret = encryptSecret; this.confirmEncryptSecret = confirmEncryptSecret; + + this.configName = configName; + this.configDescription = configDescription; + this.configStatus = configStatus; + } + + public ExamConfigurationMap(final Long institutionId, final POSTMapper postParams) { + this.id = null; + this.institutionId = institutionId; + this.examId = postParams.getLong(Domain.EXAM_CONFIGURATION_MAP.ATTR_EXAM_ID); + this.configurationNodeId = postParams.getLong(Domain.EXAM_CONFIGURATION_MAP.ATTR_CONFIGURATION_NODE_ID); + this.userNames = postParams.getString(Domain.EXAM_CONFIGURATION_MAP.ATTR_USER_NAMES); + this.encryptSecret = postParams.getCharSequence(Domain.EXAM_CONFIGURATION_MAP.ATTR_ENCRYPT_SECRET); + this.confirmEncryptSecret = postParams.getCharSequence(ATTR_CONFIRM_ENCRYPT_SECRET); + + this.configName = postParams.getString(Domain.CONFIGURATION_NODE.ATTR_NAME); + this.configDescription = postParams.getString(Domain.CONFIGURATION_NODE.ATTR_DESCRIPTION); + this.configStatus = postParams.getEnum(Domain.CONFIGURATION_NODE.ATTR_STATUS, ConfigurationStatus.class); } @Override @@ -122,6 +156,18 @@ public final class ExamConfigurationMap implements GrantEntity { return this.encryptSecret != null && this.encryptSecret.length() > 0; } + public String getConfigName() { + return this.configName; + } + + public String getConfigDescription() { + return this.configDescription; + } + + public ConfigurationStatus getConfigStatus() { + return this.configStatus; + } + @Override public String toString() { final StringBuilder builder = new StringBuilder(); @@ -133,10 +179,20 @@ public final class ExamConfigurationMap implements GrantEntity { builder.append(this.examId); builder.append(", configurationNodeId="); builder.append(this.configurationNodeId); + builder.append(", configName="); + builder.append(this.configName); + builder.append(", configDescription="); + builder.append(this.configDescription); + builder.append(", configStatus="); + builder.append(this.configStatus); builder.append(", userNames="); builder.append(this.userNames); builder.append("]"); return builder.toString(); } + public static ExamConfigurationMap createNew(final Exam exam) { + return new ExamConfigurationMap(null, exam.institutionId, exam.id, null, null, null, null, null, null, null); + } + } diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Indicator.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Indicator.java index d5b22124..112c519d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Indicator.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Indicator.java @@ -29,7 +29,7 @@ import ch.ethz.seb.sebserver.gbl.util.Utils; @JsonIgnoreProperties(ignoreUnknown = true) public final class Indicator implements Entity { - public static final String FILTER_ATTR_EXAM = "exam"; + public static final String FILTER_ATTR_EXAM_ID = "examId"; public enum IndicatorType { LAST_PING, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java index 5dc34f8b..b70b9178 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java @@ -8,6 +8,9 @@ package ch.ethz.seb.sebserver.gui.content; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; import java.util.function.BooleanSupplier; import org.apache.commons.lang3.BooleanUtils; @@ -23,6 +26,7 @@ import ch.ethz.seb.sebserver.gbl.api.API; import ch.ethz.seb.sebserver.gbl.model.Domain; import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamStatus; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator; import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; @@ -42,8 +46,10 @@ import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.page.event.ActionEvent; import ch.ethz.seb.sebserver.gui.service.page.impl.PageAction; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.DeleteExamConfigMapping; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.DeleteIndicator; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExam; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamConfigMappingsPage; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicators; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveExam; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.quiz.GetQuizData; @@ -62,28 +68,50 @@ public class ExamForm implements TemplateComposer { private static final Logger log = LoggerFactory.getLogger(ExamForm.class); - private static final LocTextKey FORM_SUPPORTER_TEXT_KEY = new LocTextKey("sebserver.exam.form.supporter"); - private static final LocTextKey FORM_STATUS_TEXT_KEY = new LocTextKey("sebserver.exam.form.status"); - private static final LocTextKey FORM_TYPE_TEXT_KEY = new LocTextKey("sebserver.exam.form.type"); - private static final LocTextKey FORM_ENDTIME_TEXT_KEY = new LocTextKey("sebserver.exam.form.endtime"); - private static final LocTextKey FORM_STARTTIME_TEXT_KEY = new LocTextKey("sebserver.exam.form.starttime"); - private static final LocTextKey FORM_DESCRIPTION_TEXT_KEY = new LocTextKey("sebserver.exam.form.description"); - private static final LocTextKey FORM_NAME_TEXT_KEY = new LocTextKey("sebserver.exam.form.name"); - private static final LocTextKey FORM_QUIZID_TEXT_KEY = new LocTextKey("sebserver.exam.form.quizid"); - private static final LocTextKey FORM_LMSSETUP_TEXT_KEY = new LocTextKey("sebserver.exam.form.lmssetup"); - private final PageService pageService; private final ResourceService resourceService; - private final static LocTextKey listTitleKey = + private static final LocTextKey CONFIG_EMPTY_LIST_MESSAGE = + new LocTextKey("sebserver.exam.configuration.list.empty"); + private static final LocTextKey INDICATOR_EMPTY_LIST_MESSAGE = + new LocTextKey("sebserver.exam.indicator.list.empty"); + private static final LocTextKey FORM_SUPPORTER_TEXT_KEY = + new LocTextKey("sebserver.exam.form.supporter"); + private static final LocTextKey FORM_STATUS_TEXT_KEY = + new LocTextKey("sebserver.exam.form.status"); + private static final LocTextKey FORM_TYPE_TEXT_KEY = + new LocTextKey("sebserver.exam.form.type"); + private static final LocTextKey FORM_ENDTIME_TEXT_KEY = + new LocTextKey("sebserver.exam.form.endtime"); + private static final LocTextKey FORM_STARTTIME_TEXT_KEY = + new LocTextKey("sebserver.exam.form.starttime"); + private static final LocTextKey FORM_DESCRIPTION_TEXT_KEY = + new LocTextKey("sebserver.exam.form.description"); + private static final LocTextKey FORM_NAME_TEXT_KEY = + new LocTextKey("sebserver.exam.form.name"); + private static final LocTextKey FORM_QUIZID_TEXT_KEY = + new LocTextKey("sebserver.exam.form.quizid"); + private static final LocTextKey FORM_LMSSETUP_TEXT_KEY = + new LocTextKey("sebserver.exam.form.lmssetup"); + + private final static LocTextKey CONFIG_LIST_TITLE_KEY = + new LocTextKey("sebserver.exam.configuration.list.title"); + private final static LocTextKey CONFIG_NAME_COLUMN_KEY = + new LocTextKey("sebserver.exam.configuration.list.column.name"); + private final static LocTextKey CONFIG_DESCRIPTION_COLUMN_KEY = + new LocTextKey("sebserver.exam.configuration.list.column.description"); + private final static LocTextKey CONFIG_STATUS_COLUMN_KEY = + new LocTextKey("sebserver.exam.configuration.list.column.status"); + + private final static LocTextKey INDICATOR_LIST_TITLE_KEY = new LocTextKey("sebserver.exam.indicator.list.title"); - private final static LocTextKey typeColumnKey = + private final static LocTextKey INDICATOR_TYPE_COLUMN_KEY = new LocTextKey("sebserver.exam.indicator.list.column.type"); - private final static LocTextKey nameColumnKey = + private final static LocTextKey INDICATOR_NAME_COLUMN_KEY = new LocTextKey("sebserver.exam.indicator.list.column.name"); - private final static LocTextKey thresholdColumnKey = + private final static LocTextKey INDICATOR_THRESHOLD_COLUMN_KEY = new LocTextKey("sebserver.exam.indicator.list.column.thresholds"); - private final static LocTextKey emptySelectionTextKey = + private final static LocTextKey INDICATOR_EMPTY_SELECTION_TEXT_KEY = new LocTextKey("sebserver.exam.indicator.list.pleaseSelect"); protected ExamForm( @@ -162,7 +190,6 @@ public class ExamForm implements TemplateComposer { .putStaticValueIf(isNew, QuizData.QUIZ_ATTR_ID, exam.externalId) - .addField(FormBuilder.singleSelection( Domain.EXAM.ATTR_LMS_SETUP_ID, FORM_LMSSETUP_TEXT_KEY, @@ -237,35 +264,102 @@ public class ExamForm implements TemplateComposer { .publishIf(() -> !readonly); // additional data in read-only view - if (readonly) { + if (readonly && !importFromQuizData) { + + // List of SEB Configuration + widgetFactory.labelLocalized( + content, + CustomVariant.TEXT_H3, + CONFIG_LIST_TITLE_KEY); + + final EntityTable configurationTable = + this.pageService.entityTableBuilder(restService.getRestCall(GetExamConfigMappingsPage.class)) + .withRestCallAdapter(builder -> builder.withQueryParam( + ExamConfigurationMap.FILTER_ATTR_EXAM_ID, + entityKey.modelId)) + .withEmptyMessage(CONFIG_EMPTY_LIST_MESSAGE) + .withPaging(1) + .hideNavigation() + .withColumn(new ColumnDefinition<>( + Domain.CONFIGURATION_NODE.ATTR_NAME, + CONFIG_NAME_COLUMN_KEY, + ExamConfigurationMap::getConfigName, + false)) + .withColumn(new ColumnDefinition<>( + Domain.CONFIGURATION_NODE.ATTR_DESCRIPTION, + CONFIG_DESCRIPTION_COLUMN_KEY, + ExamConfigurationMap::getConfigDescription, + false)) + .withColumn(new ColumnDefinition<>( + Domain.CONFIGURATION_NODE.ATTR_STATUS, + CONFIG_STATUS_COLUMN_KEY, + this.resourceService::localizedExamConfigStatusName, + false)) + .withDefaultActionIf( + () -> editable, + () -> actionBuilder + .newAction(ActionDefinition.EXAM_CONFIGURATION_MODIFY_FROM_LIST) + .create()) + + .compose(content); + + final EntityKey configMapKey = (configurationTable.hasAnyContent()) + ? configurationTable.getFirstRowData().getEntityKey() + : null; + + actionBuilder + + .newAction(ActionDefinition.EXAM_CONFIGURATION_NEW) + .withParentEntityKey(entityKey) + .publishIf(() -> modifyGrant && editable && !configurationTable.hasAnyContent()) + + .newAction(ActionDefinition.EXAM_CONFIGURATION_MODIFY_FROM_LIST) + .withParentEntityKey(entityKey) + .withEntityKey(configMapKey) + .publishIf(() -> modifyGrant && editable && configurationTable.hasAnyContent()) + + .newAction(ActionDefinition.EXAM_CONFIGURATION_DELETE_FROM_LIST) + .withEntityKey(entityKey) + .withSelect( + () -> { + final ExamConfigurationMap firstRowData = configurationTable.getFirstRowData(); + if (firstRowData == null) { + return Collections.emptySet(); + } else { + return new HashSet<>(Arrays.asList(firstRowData.getEntityKey())); + } + }, + this::deleteExamConfigMapping, + null) + .publishIf(() -> modifyGrant && configurationTable.hasAnyContent() && editable); // List of Indicators widgetFactory.labelLocalized( content, CustomVariant.TEXT_H3, - listTitleKey); + INDICATOR_LIST_TITLE_KEY); final EntityTable indicatorTable = this.pageService.entityTableBuilder(restService.getRestCall(GetIndicators.class)) .withRestCallAdapter(builder -> builder.withQueryParam( - Indicator.FILTER_ATTR_EXAM, + Indicator.FILTER_ATTR_EXAM_ID, entityKey.modelId)) - .withEmptyMessage(new LocTextKey("sebserver.exam.indicator.list.empty")) + .withEmptyMessage(INDICATOR_EMPTY_LIST_MESSAGE) .withPaging(5) .hideNavigation() .withColumn(new ColumnDefinition<>( Domain.INDICATOR.ATTR_NAME, - nameColumnKey, + INDICATOR_NAME_COLUMN_KEY, Indicator::getName, false)) .withColumn(new ColumnDefinition<>( Domain.INDICATOR.ATTR_TYPE, - typeColumnKey, + INDICATOR_TYPE_COLUMN_KEY, this::indicatorTypeName, false)) .withColumn(new ColumnDefinition<>( Domain.THRESHOLD.REFERENCE_NAME, - thresholdColumnKey, + INDICATOR_THRESHOLD_COLUMN_KEY, ExamForm::thresholdsValue, false)) .withDefaultActionIf( @@ -285,18 +379,20 @@ public class ExamForm implements TemplateComposer { .newAction(ActionDefinition.EXAM_INDICATOR_MODIFY_FROM_LIST) .withParentEntityKey(entityKey) - .withSelect(indicatorTable::getSelection, PageAction::applySingleSelection, emptySelectionTextKey) + .withSelect( + indicatorTable::getSelection, + PageAction::applySingleSelection, + INDICATOR_EMPTY_SELECTION_TEXT_KEY) .publishIf(() -> modifyGrant && indicatorTable.hasAnyContent() && editable) .newAction(ActionDefinition.EXAM_INDICATOR_DELETE_FROM_LIST) .withEntityKey(entityKey) - .withSelect(indicatorTable::getSelection, this::deleteSelectedIndicator, emptySelectionTextKey) + .withSelect( + indicatorTable::getSelection, + this::deleteSelectedIndicator, + INDICATOR_EMPTY_SELECTION_TEXT_KEY) .publishIf(() -> modifyGrant && indicatorTable.hasAnyContent() && editable); - - // TODO List of attached SEB Configurations - } - } private PageAction deleteSelectedIndicator(final PageAction action) { @@ -308,6 +404,15 @@ public class ExamForm implements TemplateComposer { return action; } + private PageAction deleteExamConfigMapping(final PageAction action) { + final EntityKey examConfigMappingKey = action.getSingleSelection(); + this.resourceService.getRestService() + .getBuilder(DeleteExamConfigMapping.class) + .withURIVariable(API.PARAM_MODEL_ID, examConfigMappingKey.modelId) + .call(); + return action; + } + private Result getExistingExam(final EntityKey entityKey, final RestService restService) { return restService.getBuilder(GetExam.class) .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamSebConfigMapForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamSebConfigMapForm.java new file mode 100644 index 00000000..76e646de --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamSebConfigMapForm.java @@ -0,0 +1,212 @@ +/* + * 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.gui.content; + +import org.apache.commons.lang3.StringUtils; +import org.eclipse.swt.widgets.Composite; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.model.Domain; +import ch.ethz.seb.sebserver.gbl.model.EntityKey; +import ch.ethz.seb.sebserver.gbl.model.exam.Exam; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; +import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition; +import ch.ethz.seb.sebserver.gui.form.Form; +import ch.ethz.seb.sebserver.gui.form.FormBuilder; +import ch.ethz.seb.sebserver.gui.form.FormHandle; +import ch.ethz.seb.sebserver.gui.service.ResourceService; +import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; +import ch.ethz.seb.sebserver.gui.service.page.PageContext; +import ch.ethz.seb.sebserver.gui.service.page.PageService; +import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExam; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamConfigMapping; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewExamConfigMapping; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveExamConfigMapping; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.examconfig.GetExamConfigNode; +import ch.ethz.seb.sebserver.gui.widget.WidgetFactory; + +@Lazy +@Component +@GuiProfile +public class ExamSebConfigMapForm implements TemplateComposer { + + private static final Logger log = LoggerFactory.getLogger(ExamSebConfigMapForm.class); + + private static final LocTextKey NEW_CONFIG_MAPPING_TILE_TEXT_KEY = + new LocTextKey("sebserver.exam.configuration.form.title.new"); + private static final LocTextKey CONFIG_MAPPING_TILE_TEXT_KEY = + new LocTextKey("sebserver.exam.configuration.form.title"); + private static final LocTextKey CONFIG_MAPPING_NAME_TEXT_KEY = + new LocTextKey("sebserver.exam.configuration.form.name"); + private static final LocTextKey FORM_DESCRIPTION_TEXT_KEY = + new LocTextKey("sebserver.exam.configuration.form.description"); + private static final LocTextKey FORM_STATUS_TEXT_KEY = + new LocTextKey("sebserver.exam.configuration.form.status"); + private static final LocTextKey FORM_ENCRYPT_SECRET_TEXT_KEY = + new LocTextKey("sebserver.exam.configuration.form.encryptSecret"); + private static final LocTextKey FORM_CONFIRM_ENCRYPT_SECRET_TEXT_KEY = + new LocTextKey("sebserver.exam.configuration.form.encryptSecret.confirm"); + + private final PageService pageService; + private final ResourceService resourceService; + + protected ExamSebConfigMapForm( + final PageService pageService, + final ResourceService resourceService) { + + this.pageService = pageService; + this.resourceService = resourceService; + } + + @Override + public void compose(final PageContext pageContext) { + final RestService restService = this.resourceService.getRestService(); + final WidgetFactory widgetFactory = this.pageService.getWidgetFactory(); + + final EntityKey entityKey = pageContext.getEntityKey(); + final EntityKey parentEntityKey = pageContext.getParentEntityKey(); + final boolean isNew = entityKey == null; + final boolean isReadonly = pageContext.isReadonly(); + + final Exam exam = (isNew) + ? restService + .getBuilder(GetExam.class) + .withURIVariable(API.PARAM_MODEL_ID, parentEntityKey.modelId) + .call() + .get(pageContext::notifyError) + : null; + + // get data or create new. Handle error if happen + final ExamConfigurationMap examConfigurationMap = (isNew) + ? ExamConfigurationMap.createNew(exam) + : restService + .getBuilder(GetExamConfigMapping.class) + .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId) + .call() + .get(pageContext::notifyError); + + if (examConfigurationMap == null) { + log.error("Failed to get ExamConfigurationMap. " + + "Error is notified to the User. " + + "See previous logs for more infomation"); + return; + } + + // new PageContext with actual EntityKey + final PageContext formContext = pageContext.withEntityKey(examConfigurationMap.getEntityKey()); + + // the default page layout + final LocTextKey titleKey = (isNew) + ? NEW_CONFIG_MAPPING_TILE_TEXT_KEY + : CONFIG_MAPPING_TILE_TEXT_KEY; + final Composite content = widgetFactory.defaultPageLayout( + formContext.getParent(), + titleKey); + + final FormHandle formHandle = this.pageService.formBuilder( + formContext.copyOf(content), 4) + .readonly(isReadonly) + .putStaticValueIf(() -> !isNew, + Domain.EXAM_CONFIGURATION_MAP.ATTR_ID, + examConfigurationMap.getModelId()) + .putStaticValue( + Domain.EXAM_CONFIGURATION_MAP.ATTR_INSTITUTION_ID, + String.valueOf(examConfigurationMap.getInstitutionId())) + .putStaticValue( + Domain.EXAM_CONFIGURATION_MAP.ATTR_EXAM_ID, + String.valueOf(examConfigurationMap.examId)) + .addField(FormBuilder.singleSelection( + Domain.EXAM_CONFIGURATION_MAP.ATTR_CONFIGURATION_NODE_ID, + CONFIG_MAPPING_NAME_TEXT_KEY, + String.valueOf(examConfigurationMap.configurationNodeId), + this.resourceService::examConfigurationSelectionResources) + .withSelectionListener(this::updateFormValuesFromConfigSelection)) + + .addField(FormBuilder.text( + Domain.CONFIGURATION_NODE.ATTR_DESCRIPTION, + FORM_DESCRIPTION_TEXT_KEY, + examConfigurationMap.configDescription) + .asArea() + .readonly(true)) + + .addField(FormBuilder.text( + Domain.CONFIGURATION_NODE.ATTR_STATUS, + FORM_STATUS_TEXT_KEY, + this.resourceService.localizedExamConfigStatusName(examConfigurationMap)) + .readonly(true)) + + .addField(FormBuilder.text( + Domain.EXAM_CONFIGURATION_MAP.ATTR_ENCRYPT_SECRET, + FORM_ENCRYPT_SECRET_TEXT_KEY) + .asPasswordField()) + .addField(FormBuilder.text( + ExamConfigurationMap.ATTR_CONFIRM_ENCRYPT_SECRET, + FORM_CONFIRM_ENCRYPT_SECRET_TEXT_KEY) + .asPasswordField()) + + .buildFor((isNew) + ? restService.getRestCall(NewExamConfigMapping.class) + : restService.getRestCall(SaveExamConfigMapping.class)); + + // propagate content actions to action-pane + this.pageService.pageActionBuilder(formContext.clearEntityKeys()) + + .newAction(ActionDefinition.EXAM_CONFIGURATION_SAVE) + .withEntityKey(parentEntityKey) + .withExec(formHandle::processFormSave) + .ignoreMoveAwayFromEdit() + .publishIf(() -> !isReadonly) + + .newAction(ActionDefinition.EXAM_CONFIGURATION_CANCEL_MODIFY) + .withEntityKey(parentEntityKey) + .withExec(action -> this.pageService.onEmptyEntityKeyGoTo( + action, + ActionDefinition.EXAM_VIEW_LIST)) + .publishIf(() -> !isReadonly); + } + + private void updateFormValuesFromConfigSelection(final Form form) { + final String configId = form.getFieldValue(Domain.EXAM_CONFIGURATION_MAP.ATTR_CONFIGURATION_NODE_ID); + if (StringUtils.isBlank(configId)) { + form.setFieldValue(Domain.CONFIGURATION_NODE.ATTR_DESCRIPTION, null); + form.setFieldValue(Domain.CONFIGURATION_NODE.ATTR_STATUS, null); + } else { + try { + + final ConfigurationNode configuration = this.resourceService + .getRestService() + .getBuilder(GetExamConfigNode.class) + .withURIVariable(API.PARAM_MODEL_ID, configId) + .call() + .getOrThrow(); + + form.setFieldValue( + Domain.CONFIGURATION_NODE.ATTR_DESCRIPTION, + configuration.description); + form.setFieldValue( + Domain.CONFIGURATION_NODE.ATTR_STATUS, + this.resourceService.localizedExamConfigStatusName(configuration)); + + } catch (final Exception e) { + log.error("Failed to update form values from SEB Configuration selection", e); + form.setFieldValue(Domain.CONFIGURATION_NODE.ATTR_DESCRIPTION, null); + form.setFieldValue(Domain.CONFIGURATION_NODE.ATTR_STATUS, null); + } + } + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/IndicatorForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/IndicatorForm.java index 5d431863..3d0c8d66 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/IndicatorForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/IndicatorForm.java @@ -43,6 +43,10 @@ public class IndicatorForm implements TemplateComposer { private static final Logger log = LoggerFactory.getLogger(IndicatorForm.class); + private static final LocTextKey NEW_INDICATOR_TILE_TEXT_KEY = + new LocTextKey("sebserver.exam.indicator.form.title.new"); + private static final LocTextKey INDICATOR_TILE_TEXT_KEY = + new LocTextKey("sebserver.exam.indicator.form.title"); private static final LocTextKey FORM_THRESHOLDS_TEXT_KEY = new LocTextKey("sebserver.exam.indicator.form.thresholds"); private static final LocTextKey FORM_COLOR_TEXT_KEY = @@ -100,10 +104,9 @@ public class IndicatorForm implements TemplateComposer { final PageContext formContext = pageContext.withEntityKey(indicator.getEntityKey()); // the default page layout - final LocTextKey titleKey = new LocTextKey( - (isNew) - ? "sebserver.exam.indicator.form.title.new" - : "sebserver.exam.indicator.form.title"); + final LocTextKey titleKey = (isNew) + ? NEW_INDICATOR_TILE_TEXT_KEY + : INDICATOR_TILE_TEXT_KEY; final Composite content = widgetFactory.defaultPageLayout( formContext.getParent(), titleKey); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigList.java index 39664767..6f446635 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigList.java @@ -8,14 +8,11 @@ package ch.ethz.seb.sebserver.gui.content; -import java.util.function.Function; - import org.eclipse.swt.widgets.Composite; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.model.Domain; import ch.ethz.seb.sebserver.gbl.model.Entity; @@ -114,7 +111,7 @@ public class SebExamConfigList implements TemplateComposer { () -> new ColumnDefinition<>( Domain.LMS_SETUP.ATTR_INSTITUTION_ID, INSTITUTION_TEXT_KEY, - examConfigInstitutionNameFunction(this.resourceService), + this.resourceService::localizedExamConfigInstitutionName, this.institutionFilter, false)) .withColumn(new ColumnDefinition<>( @@ -132,7 +129,7 @@ public class SebExamConfigList implements TemplateComposer { .withColumn(new ColumnDefinition<>( Domain.CONFIGURATION_NODE.ATTR_STATUS, STATUS_TEXT_KEY, - this::examConfigStatusName, + this.resourceService::localizedExamConfigStatusName, this.statusFilter, true)) .withDefaultAction(pageActionBuilder @@ -141,7 +138,6 @@ public class SebExamConfigList implements TemplateComposer { .compose(content); final GrantCheck examConfigGrant = this.currentUser.grantCheck(EntityType.CONFIGURATION_NODE); - pageActionBuilder .newAction(ActionDefinition.SEB_EXAM_CONFIG_NEW) @@ -160,20 +156,4 @@ public class SebExamConfigList implements TemplateComposer { .publishIf(() -> examConfigGrant.im() && table.hasAnyContent()); } - private static Function examConfigInstitutionNameFunction( - final ResourceService resourceService) { - - return config -> resourceService.getInstitutionNameFunction() - .apply(String.valueOf(config.institutionId)); - } - - private String examConfigStatusName(final ConfigurationNode config) { - if (config.status == null) { - return Constants.EMPTY_NOTE; - } - - return this.resourceService.getI18nSupport() - .getText(ResourceService.EXAMCONFIG_STATUS_PREFIX + config.status.name()); - } - } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigPropForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigPropForm.java index 043463f5..75b45229 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigPropForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigPropForm.java @@ -134,7 +134,8 @@ public class SebExamConfigPropForm implements TemplateComposer { .addField(FormBuilder.text( Domain.CONFIGURATION_NODE.ATTR_DESCRIPTION, FORM_DESCRIPTION_TEXT_KEY, - examConfig.description).asArea()) + examConfig.description) + .asArea()) .addField(FormBuilder.singleSelection( Domain.CONFIGURATION_NODE.ATTR_STATUS, FORM_STATUS_TEXT_KEY, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java index acefda66..cf81b3f0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java @@ -17,7 +17,8 @@ public enum ActionCategory { LMS_SETUP_LIST(new LocTextKey("sebserver.lmssetup.list.actions"), 1), QUIZ_LIST(new LocTextKey("sebserver.quizdiscovery.list.actions"), 1), EXAM_LIST(new LocTextKey("sebserver.exam.list.actions"), 1), - INDICATOR_LIST(new LocTextKey("sebserver.exam.indicator.list.actions"), 1), + EXAM_CONFIG_MAPPING_LIST(new LocTextKey("sebserver.exam.configuration.list.actions"), 1), + INDICATOR_LIST(new LocTextKey("sebserver.exam.indicator.list.actions"), 2), SEB_CLIENT_CONFIG_LIST(new LocTextKey("sebserver.clientconfig.list.actions"), 1), SEB_EXAM_CONFIG_LIST(new LocTextKey("sebserver.examconfig.list.actions"), 1), VARIA(new LocTextKey("sebserver.overall.action.category.varia"), 100), diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java index 963b8d51..1869265f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java @@ -228,10 +228,37 @@ public enum ActionDefinition { PageStateDefinition.EXAM_VIEW, ActionCategory.FORM), + EXAM_CONFIGURATION_NEW( + new LocTextKey("sebserver.exam.configuration.action.list.new"), + ImageIcon.NEW, + PageStateDefinition.EXAM_CONFIG_MAP_EDIT, + ActionCategory.EXAM_CONFIG_MAPPING_LIST), + EXAM_CONFIGURATION_MODIFY_FROM_LIST( + new LocTextKey("sebserver.exam.configuration.action.list.modify"), + ImageIcon.EDIT, + PageStateDefinition.EXAM_CONFIG_MAP_EDIT, + ActionCategory.EXAM_CONFIG_MAPPING_LIST), + EXAM_CONFIGURATION_DELETE_FROM_LIST( + new LocTextKey("sebserver.exam.configuration.action.list.delete"), + ImageIcon.DELETE, + PageStateDefinition.EXAM_VIEW, + ActionCategory.EXAM_CONFIG_MAPPING_LIST), + EXAM_CONFIGURATION_SAVE( + new LocTextKey("sebserver.exam.configuration.action.save"), + ImageIcon.SAVE, + PageStateDefinition.EXAM_VIEW, + ActionCategory.FORM), + EXAM_CONFIGURATION_CANCEL_MODIFY( + new LocTextKey("sebserver.overall.action.modify.cancel"), + ImageIcon.CANCEL, + PageStateDefinition.EXAM_VIEW, + ActionCategory.FORM), + EXAM_INDICATOR_NEW( new LocTextKey("sebserver.exam.indicator.action.list.new"), ImageIcon.NEW, - PageStateDefinition.INDICATOR_EDIT), + PageStateDefinition.INDICATOR_EDIT, + ActionCategory.INDICATOR_LIST), EXAM_INDICATOR_MODIFY_FROM_LIST( new LocTextKey("sebserver.exam.indicator.action.list.modify"), ImageIcon.EDIT, @@ -325,7 +352,7 @@ public enum ActionDefinition { ActionCategory.FORM), SEB_EXAM_CONFIG_MODIFY( new LocTextKey("sebserver.examconfig.action.modify"), - ImageIcon.EDIT, + ImageIcon.EDIT_SETTINGS, PageStateDefinition.SEB_EXAM_CONFIG_EDIT, ActionCategory.FORM), SEB_EXAM_CONFIG_CANCEL_MODIFY( @@ -341,7 +368,7 @@ public enum ActionDefinition { SEB_EXAM_CONFIG_MODIFY_FROM_LIST( new LocTextKey("sebserver.examconfig.action.list.modify"), - ImageIcon.EDIT, + ImageIcon.EDIT_SETTINGS, PageStateDefinition.SEB_EXAM_CONFIG_EDIT, ActionCategory.SEB_EXAM_CONFIG_LIST), @@ -352,7 +379,7 @@ public enum ActionDefinition { ActionCategory.SEB_EXAM_CONFIG_LIST), SEB_EXAM_CONFIG_UNDO( new LocTextKey("sebserver.examconfig.action.undo"), - ImageIcon.SAVE, + ImageIcon.UNDO, PageStateDefinition.SEB_EXAM_CONFIG_EDIT, ActionCategory.SEB_EXAM_CONFIG_LIST), diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java index bb6e3828..3bd4d6a4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java @@ -119,9 +119,9 @@ public class ActionPane implements TemplateComposer { } } - final Label labelSeparator = this.widgetFactory.labelSeparator(composite); - final GridData separatorLayout = new GridData(SWT.FILL, SWT.TOP, true, false); - labelSeparator.setLayoutData(separatorLayout); +// final Label labelSeparator = this.widgetFactory.labelSeparator(composite); +// final GridData separatorLayout = new GridData(SWT.FILL, SWT.TOP, true, false); +// labelSeparator.setLayoutData(separatorLayout); // title if (category.title != null) { @@ -140,7 +140,7 @@ public class ActionPane implements TemplateComposer { composite, SWT.SINGLE | SWT.FULL_SELECTION); actions.setData(RWT.CUSTOM_VARIANT, "actions"); - final GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true); + final GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); actions.setLayoutData(gridData); final Template template = new Template(); final ImageCell imageCell = new ImageCell(template); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/PageStateDefinition.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/PageStateDefinition.java index 05864310..c4cf1a19 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/PageStateDefinition.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/PageStateDefinition.java @@ -10,6 +10,7 @@ package ch.ethz.seb.sebserver.gui.content.activity; import ch.ethz.seb.sebserver.gui.content.ExamForm; import ch.ethz.seb.sebserver.gui.content.ExamList; +import ch.ethz.seb.sebserver.gui.content.ExamSebConfigMapForm; import ch.ethz.seb.sebserver.gui.content.IndicatorForm; import ch.ethz.seb.sebserver.gui.content.InstitutionForm; import ch.ethz.seb.sebserver.gui.content.InstitutionList; @@ -49,6 +50,7 @@ public enum PageStateDefinition implements PageState { EXAM_LIST(Type.LIST_VIEW, ExamList.class, ActivityDefinition.EXAM), EXAM_VIEW(Type.FORM_VIEW, ExamForm.class, ActivityDefinition.EXAM), EXAM_EDIT(Type.FORM_EDIT, ExamForm.class, ActivityDefinition.EXAM), + EXAM_CONFIG_MAP_EDIT(Type.FORM_EDIT, ExamSebConfigMapForm.class, ActivityDefinition.EXAM), INDICATOR_EDIT(Type.FORM_EDIT, IndicatorForm.class, ActivityDefinition.EXAM), SEB_CLIENT_CONFIG_LIST(Type.LIST_VIEW, SebClientConfigList.class, ActivityDefinition.SEB_CLIENT_CONFIG), diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java b/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java index c76269f0..6a0c3113 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java @@ -143,6 +143,24 @@ public final class Form implements FormBinding { this.formFields.add(name, createAccessor(label, imageUpload)); } + public String getFieldValue(final String attributeName) { + final FormFieldAccessor fieldAccessor = this.formFields.getFirst(attributeName); + if (fieldAccessor == null) { + return null; + } + + return fieldAccessor.getStringValue(); + } + + public void setFieldValue(final String attributeName, final String attributeValue) { + final FormFieldAccessor fieldAccessor = this.formFields.getFirst(attributeName); + if (fieldAccessor == null) { + return; + } + + fieldAccessor.setStringValue(attributeValue); + } + public void allVisible() { process( name -> true, @@ -208,11 +226,13 @@ public final class Form implements FormBinding { private FormFieldAccessor createAccessor(final Label label, final Label field) { return new FormFieldAccessor(label, field) { @Override public String getStringValue() { return null; } + @Override public void setStringValue(final String value) { field.setText( (value == null) ? StringUtils.EMPTY : value); } }; } private FormFieldAccessor createAccessor(final Label label, final Text text) { return new FormFieldAccessor(label, text) { @Override public String getStringValue() { return text.getText(); } + @Override public void setStringValue(final String value) { text.setText( (value == null) ? StringUtils.EMPTY : value); } }; } private FormFieldAccessor createAccessor(final Label label, final Selection selection) { @@ -234,6 +254,7 @@ public final class Form implements FormBinding { jsonValueAdapter, selection.type() != Type.SINGLE) { @Override public String getStringValue() { return selection.getSelectionValue(); } + @Override public void setStringValue(final String value) { selection.select(value); } }; } private FormFieldAccessor createAccessor(final Label label, final ThresholdList thresholdList) { @@ -356,6 +377,10 @@ public final class Form implements FormBinding { public abstract String getStringValue(); + public void setStringValue(final String value) { + throw new UnsupportedOperationException(); + } + public void setVisible(final boolean visible) { this.label.setVisible(visible); this.control.setVisible(visible); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/form/FormBuilder.java b/src/main/java/ch/ethz/seb/sebserver/gui/form/FormBuilder.java index 143a7835..a98ce987 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/form/FormBuilder.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/form/FormBuilder.java @@ -256,7 +256,7 @@ public class FormBuilder { Label valueLabel(final Composite parent, final String value, final int hspan) { final Label label = new Label(parent, SWT.NONE); label.setText((StringUtils.isNoneBlank(value)) ? value : Constants.EMPTY_NOTE); - final GridData gridData = new GridData(SWT.LEFT, SWT.CENTER, true, false, hspan, 1); + final GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false, hspan, 1); gridData.verticalIndent = 4; label.setLayoutData(gridData); return label; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java index 54873000..e4186eb2 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java @@ -24,17 +24,23 @@ import org.springframework.stereotype.Service; import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.model.Entity; +import ch.ethz.seb.sebserver.gbl.model.EntityName; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; import ch.ethz.seb.sebserver.gbl.model.exam.Exam.ExamType; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator.IndicatorType; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType; +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.ConfigurationType; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserRole; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Tuple; import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport; import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetExamConfigMappingNames; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.GetInstitutionNames; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.lmssetup.GetLmsSetupNames; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.GetUserAccountNames; @@ -105,6 +111,28 @@ public class ResourceService { .collect(Collectors.toList()); } + public List> examConfigurationSelectionResources() { + return getExamConfigurationSelection() + .getOr(Collections.emptyList()) + .stream() + .map(entityName -> new Tuple<>(entityName.modelId, entityName.name)) + .collect(Collectors.toList()); + } + +// public Function getExamConfigurationNameFunction() { +// final Map idNameMap = getExamConfigurationSelection() +// .getOr(Collections.emptyList()) +// .stream() +// .collect(Collectors.toMap(e -> e.modelId, e -> e.name)); +// +// return id -> { +// if (!idNameMap.containsKey(id)) { +// return Constants.EMPTY_NOTE; +// } +// return idNameMap.get(id); +// }; +// } + public List> userRoleResources() { return UserRole.publicRolesForUser(this.currentUser.get()) .stream() @@ -125,7 +153,6 @@ public class ResourceService { } public Function getInstitutionNameFunction() { - final Map idNameMap = this.restService.getBuilder(GetInstitutionNames.class) .withQueryParam(Entity.FILTER_ATTR_ACTIVE, Constants.TRUE_STRING) .call() @@ -248,4 +275,41 @@ public class ResourceService { : this.i18nSupport.getText(INACTIVE_TEXT_KEY); } + public String localizedExamConfigInstitutionName(final ConfigurationNode config) { + return getInstitutionNameFunction() + .apply(String.valueOf(config.institutionId)); + } + + public String localizedExamConfigStatusName(final ConfigurationNode config) { + if (config.status == null) { + return Constants.EMPTY_NOTE; + } + + return this.i18nSupport + .getText(ResourceService.EXAMCONFIG_STATUS_PREFIX + config.status.name()); + } + + public String localizedExamConfigStatusName(final ExamConfigurationMap config) { + if (config.configStatus == null) { + return Constants.EMPTY_NOTE; + } + + return this.i18nSupport + .getText(ResourceService.EXAMCONFIG_STATUS_PREFIX + config.configStatus.name()); + } + + private Result> getExamConfigurationSelection() { + return this.restService.getBuilder(GetExamConfigMappingNames.class) + .withQueryParam( + Entity.FILTER_ATTR_INSTITUTION, + String.valueOf(this.currentUser.get().institutionId)) + .withQueryParam( + ConfigurationNode.FILTER_ATTR_TYPE, + ConfigurationType.EXAM_CONFIG.name()) + .withQueryParam( + ConfigurationNode.FILTER_ATTR_STATUS, + ConfigurationStatus.READY_TO_USE.name()) + .call(); + } + } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableFieldBuilder.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableFieldBuilder.java index 54aa887a..54c8a433 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableFieldBuilder.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/TableFieldBuilder.java @@ -298,8 +298,8 @@ public class TableFieldBuilder implements InputFieldBuilder { item.setImage( cellIndex, (BooleanUtils.toBoolean((tableValue != null) ? tableValue.value : null)) - ? ImageIcon.ACTIVE.getImage(this.control.getDisplay()) - : ImageIcon.INACTIVE.getImage(this.control.getDisplay())); + ? ImageIcon.YES.getImage(this.control.getDisplay()) + : ImageIcon.NO.getImage(this.control.getDisplay())); } else { item.setText( cellIndex, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/DeleteExamConfigMapping.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/DeleteExamConfigMapping.java new file mode 100644 index 00000000..97087016 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/DeleteExamConfigMapping.java @@ -0,0 +1,39 @@ +/* + * 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.gui.service.remote.webservice.api.exam; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class DeleteExamConfigMapping extends RestCall { + + protected DeleteExamConfigMapping() { + super(new TypeKey<>( + CallType.DELETE, + EntityType.EXAM_CONFIGURATION_MAP, + new TypeReference() { + }), + HttpMethod.DELETE, + MediaType.APPLICATION_JSON_UTF8, + API.EXAM_CONFIGURATION_MAP_ENDPOINT + API.MODEL_ID_VAR_PATH_SEGMENT); + } +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMapping.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMapping.java new file mode 100644 index 00000000..7172d8a5 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMapping.java @@ -0,0 +1,40 @@ +/* + * 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.gui.service.remote.webservice.api.exam; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class GetExamConfigMapping extends RestCall { + + protected GetExamConfigMapping() { + super(new TypeKey<>( + CallType.GET_SINGLE, + EntityType.EXAM_CONFIGURATION_MAP, + new TypeReference() { + }), + HttpMethod.GET, + MediaType.APPLICATION_FORM_URLENCODED, + API.EXAM_CONFIGURATION_MAP_ENDPOINT + API.MODEL_ID_VAR_PATH_SEGMENT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMappingNames.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMappingNames.java new file mode 100644 index 00000000..26f8647f --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMappingNames.java @@ -0,0 +1,42 @@ +/* + * 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.gui.service.remote.webservice.api.exam; + +import java.util.List; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.EntityName; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class GetExamConfigMappingNames extends RestCall> { + + protected GetExamConfigMappingNames() { + super(new TypeKey<>( + CallType.GET_NAMES, + EntityType.CONFIGURATION_NODE, + new TypeReference>() { + }), + HttpMethod.GET, + MediaType.APPLICATION_FORM_URLENCODED, + API.CONFIGURATION_NODE_ENDPOINT + API.NAMES_PATH_SEGMENT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMappingsPage.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMappingsPage.java new file mode 100644 index 00000000..cd269c0b --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/GetExamConfigMappingsPage.java @@ -0,0 +1,41 @@ +/* + * 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.gui.service.remote.webservice.api.exam; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.Page; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class GetExamConfigMappingsPage extends RestCall> { + + protected GetExamConfigMappingsPage() { + super(new TypeKey<>( + CallType.GET_PAGE, + EntityType.EXAM_CONFIGURATION_MAP, + new TypeReference>() { + }), + HttpMethod.GET, + MediaType.APPLICATION_FORM_URLENCODED, + API.EXAM_CONFIGURATION_MAP_ENDPOINT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/NewExamConfigMapping.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/NewExamConfigMapping.java new file mode 100644 index 00000000..0056deda --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/NewExamConfigMapping.java @@ -0,0 +1,40 @@ +/* + * 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.gui.service.remote.webservice.api.exam; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class NewExamConfigMapping extends RestCall { + + protected NewExamConfigMapping() { + super(new TypeKey<>( + CallType.NEW, + EntityType.EXAM_CONFIGURATION_MAP, + new TypeReference() { + }), + HttpMethod.POST, + MediaType.APPLICATION_FORM_URLENCODED, + API.EXAM_CONFIGURATION_MAP_ENDPOINT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/SaveExamConfigMapping.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/SaveExamConfigMapping.java new file mode 100644 index 00000000..ab5b21dc --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/exam/SaveExamConfigMapping.java @@ -0,0 +1,40 @@ +/* + * 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.gui.service.remote.webservice.api.exam; + +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.core.type.TypeReference; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall; + +@Lazy +@Component +@GuiProfile +public class SaveExamConfigMapping extends RestCall { + + protected SaveExamConfigMapping() { + super(new TypeKey<>( + CallType.SAVE, + EntityType.EXAM_CONFIGURATION_MAP, + new TypeReference() { + }), + HttpMethod.PUT, + MediaType.APPLICATION_JSON_UTF8, + API.EXAM_CONFIGURATION_MAP_ENDPOINT); + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java b/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java index f66b8920..863dc27d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java @@ -101,7 +101,6 @@ public class EntityTable { layout.verticalSpacing = 0; this.composite.setLayout(layout); GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); - // gridData.heightHint = (pageSize + 2) * 40; this.composite.setLayoutData(gridData); // TODO just for debugging, remove when tested @@ -223,6 +222,19 @@ public class EntityTable { return getRowDataId(selection[0]); } + public ROW getFirstRowData() { + if (!this.hasAnyContent()) { + return null; + } + + final TableItem item = this.table.getItem(0); + if (item == null) { + return null; + } + + return getRowData(item); + } + public ROW getSelectedROWData() { final TableItem[] selection = this.table.getSelection(); if (selection == null || selection.length == 0) { @@ -296,9 +308,6 @@ public class EntityTable { // TODO error handling }); - final GridData gridData = (GridData) this.composite.getLayoutData(); - gridData.heightHint = (this.table.getItemCount() + 2) * 50; - this.composite.layout(true, true); } @@ -405,9 +414,9 @@ public class EntityTable { private static void addBooleanCell(final TableItem item, final int index, final Object value) { if ((Boolean) value) { - item.setImage(index, ImageIcon.ACTIVE.getImage(item.getDisplay())); + item.setImage(index, ImageIcon.YES.getImage(item.getDisplay())); } else { - item.setImage(index, ImageIcon.INACTIVE.getImage(item.getDisplay())); + item.setImage(index, ImageIcon.NO.getImage(item.getDisplay())); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/widget/PopupListSelection.java b/src/main/java/ch/ethz/seb/sebserver/gui/widget/PopupListSelection.java new file mode 100644 index 00000000..36f75e97 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/widget/PopupListSelection.java @@ -0,0 +1,17 @@ +/* + * 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.gui.widget; + +public class PopupListSelection { + + public PopupListSelection() { + // TODO Auto-generated constructor stub + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java index 58949702..3d5b300c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java @@ -68,6 +68,7 @@ public class WidgetFactory { ADD_BOX("add_box.png"), REMOVE_BOX("remove_box.png"), EDIT("edit.png"), + EDIT_SETTINGS("settings.png"), TEST("test.png"), IMPORT("import.png"), CANCEL("cancel.png"), @@ -75,10 +76,13 @@ public class WidgetFactory { SHOW("show.png"), ACTIVE("active.png"), INACTIVE("inactive.png"), + YES("yes.png"), + NO("no.png"), SAVE("save.png"), NEW("new.png"), DELETE("delete.png"), SEARCH("lens.png"), + UNDO("undo.png"), COLOR("color.png"); private String fileName; diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamConfigurationMapDAO.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamConfigurationMapDAO.java index 0f666e0d..a58ecaf5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamConfigurationMapDAO.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/ExamConfigurationMapDAO.java @@ -8,7 +8,7 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.dao; -import ch.ethz.seb.sebserver.gbl.model.sebconfig.ExamConfigurationMap; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionSupportDAO; public interface ExamConfigurationMapDAO extends diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/FilterMap.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/FilterMap.java index c5f50409..5a11668a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/FilterMap.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/FilterMap.java @@ -15,6 +15,7 @@ import org.springframework.util.MultiValueMap; import ch.ethz.seb.sebserver.gbl.api.POSTMapper; import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.exam.Exam; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; import ch.ethz.seb.sebserver.gbl.model.exam.Indicator; import ch.ethz.seb.sebserver.gbl.model.exam.QuizData; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup; @@ -22,7 +23,6 @@ import ch.ethz.seb.sebserver.gbl.model.sebconfig.Configuration; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationAttribute; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode; import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationValue; -import ch.ethz.seb.sebserver.gbl.model.sebconfig.ExamConfigurationMap; import ch.ethz.seb.sebserver.gbl.model.sebconfig.Orientation; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.util.Utils; @@ -100,7 +100,7 @@ public class FilterMap extends POSTMapper { } public Long getIndicatorExamId() { - return getLong(Indicator.FILTER_ATTR_EXAM); + return getLong(Indicator.FILTER_ATTR_EXAM_ID); } public String getIndicatorName() { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationNodeDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationNodeDAOImpl.java index d3e6159d..66185e86 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationNodeDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationNodeDAOImpl.java @@ -213,10 +213,10 @@ public class ConfigurationNodeDAOImpl implements ConfigurationNodeDAO { data.id, null, null, + null, data.name, data.description, null, - null, (data.status != null) ? data.status.name() : ConfigurationStatus.CONSTRUCTION.name()); this.configurationNodeRecordMapper.updateByPrimaryKeySelective(newRecord); diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java index 8bdc1781..71934c09 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamConfigurationMapDAOImpl.java @@ -19,6 +19,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; +import org.apache.commons.lang3.StringUtils; import org.mybatis.dynamic.sql.SqlBuilder; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -29,7 +30,8 @@ import ch.ethz.seb.sebserver.gbl.api.APIMessage.APIMessageException; import ch.ethz.seb.sebserver.gbl.api.APIMessage.ErrorMessage; import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.model.EntityKey; -import ch.ethz.seb.sebserver.gbl.model.sebconfig.ExamConfigurationMap; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; +import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigurationNode.ConfigurationStatus; 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.ConfigurationNodeRecordMapper; @@ -79,7 +81,7 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { @Transactional(readOnly = true) public Result byPK(final Long id) { return recordById(id) - .flatMap(ExamConfigurationMapDAOImpl::toDomainModel); + .flatMap(this::toDomainModel); } @Override @@ -91,7 +93,7 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { .build() .execute() .stream() - .map(ExamConfigurationMapDAOImpl::toDomainModel) + .map(this::toDomainModel) .flatMap(DAOLoggingSupport::logAndSkipOnError) .collect(Collectors.toList()); }); @@ -117,7 +119,7 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { .build() .execute() .stream() - .map(ExamConfigurationMapDAOImpl::toDomainModel) + .map(this::toDomainModel) .flatMap(DAOLoggingSupport::logAndSkipOnError) .filter(predicate) .collect(Collectors.toList())); @@ -139,7 +141,7 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { this.examConfigurationMapRecordMapper.insert(newRecord); return newRecord; }) - .flatMap(ExamConfigurationMapDAOImpl::toDomainModel) + .flatMap(this::toDomainModel) .onError(TransactionHandler::rollback); } @@ -159,7 +161,7 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { this.examConfigurationMapRecordMapper.updateByPrimaryKeySelective(newRecord); return this.examConfigurationMapRecordMapper.selectByPrimaryKey(data.id); }) - .flatMap(ExamConfigurationMapDAOImpl::toDomainModel) + .flatMap(this::toDomainModel) .onError(TransactionHandler::rollback); } @@ -223,15 +225,25 @@ public class ExamConfigurationMapDAOImpl implements ExamConfigurationMapDAO { }); } - private static Result toDomainModel(final ExamConfigurationMapRecord record) { - return Result.tryCatch(() -> new ExamConfigurationMap( - record.getId(), - record.getInstitutionId(), - record.getExamId(), - record.getConfigurationNodeId(), - record.getUserNames(), - null, - null)); + private Result toDomainModel(final ExamConfigurationMapRecord record) { + return Result.tryCatch(() -> { + + final ConfigurationNodeRecord selectByPrimaryKey = this.configurationNodeRecordMapper + .selectByPrimaryKey(record.getConfigurationNodeId()); + final String status = selectByPrimaryKey.getStatus(); + + return new ExamConfigurationMap( + record.getId(), + record.getInstitutionId(), + record.getExamId(), + record.getConfigurationNodeId(), + record.getUserNames(), + null, + null, + selectByPrimaryKey.getName(), + selectByPrimaryKey.getDescription(), + (StringUtils.isNotBlank(status)) ? ConfigurationStatus.valueOf(status) : null); + }); } private Result checkMappingIntegrity(final ExamConfigurationMap data) { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/EntityController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/EntityController.java index bb9055d9..03ff29be 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/EntityController.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/EntityController.java @@ -30,9 +30,9 @@ import org.springframework.web.bind.annotation.RequestParam; import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.api.API; import ch.ethz.seb.sebserver.gbl.api.API.BulkActionType; -import ch.ethz.seb.sebserver.gbl.api.authorization.PrivilegeType; import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.POSTMapper; +import ch.ethz.seb.sebserver.gbl.api.authorization.PrivilegeType; import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.EntityName; diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamConfigurationMappingController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamConfigurationMappingController.java new file mode 100644 index 00000000..7d637bb5 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamConfigurationMappingController.java @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET) + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +package ch.ethz.seb.sebserver.webservice.weblayer.api; + +import org.mybatis.dynamic.sql.SqlTable; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import ch.ethz.seb.sebserver.gbl.api.API; +import ch.ethz.seb.sebserver.gbl.api.APIMessage; +import ch.ethz.seb.sebserver.gbl.api.APIMessage.APIMessageException; +import ch.ethz.seb.sebserver.gbl.api.EntityType; +import ch.ethz.seb.sebserver.gbl.api.POSTMapper; +import ch.ethz.seb.sebserver.gbl.model.Domain; +import ch.ethz.seb.sebserver.gbl.model.GrantEntity; +import ch.ethz.seb.sebserver.gbl.model.exam.ExamConfigurationMap; +import ch.ethz.seb.sebserver.gbl.model.user.PasswordChange; +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.ExamConfigurationMapRecordDynamicSqlSupport; +import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService; +import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationService; +import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionService; +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.UserActivityLogDAO; +import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationService; + +@WebServiceProfile +@RestController +@RequestMapping("/${sebserver.webservice.api.admin.endpoint}" + API.EXAM_CONFIGURATION_MAP_ENDPOINT) +public class ExamConfigurationMappingController extends EntityController { + + private final ExamDAO examDao; + + protected ExamConfigurationMappingController( + final AuthorizationService authorization, + final BulkActionService bulkActionService, + final EntityDAO entityDAO, + final UserActivityLogDAO userActivityLogDAO, + final PaginationService paginationService, + final BeanValidationService beanValidationService, + final ExamDAO examDao) { + + super( + authorization, + bulkActionService, + entityDAO, + userActivityLogDAO, + paginationService, + beanValidationService); + + this.examDao = examDao; + } + + @Override + protected ExamConfigurationMap createNew(final POSTMapper postParams) { + final Long institutionId = postParams.getLong(API.PARAM_INSTITUTION_ID); + return new ExamConfigurationMap(institutionId, postParams); + } + + @Override + protected SqlTable getSQLTableOfEntity() { + return ExamConfigurationMapRecordDynamicSqlSupport.examConfigurationMapRecord; + } + + @Override + protected EntityType getGrantEntityType() { + return EntityType.EXAM; + } + + @Override + protected GrantEntity toGrantEntity(final ExamConfigurationMap entity) { + if (entity == null) { + return null; + } + + return this.examDao + .byPK(entity.examId) + .getOrThrow(); + } + + @Override + protected Result checkCreateAccess(final ExamConfigurationMap entity) { + final GrantEntity grantEntity = toGrantEntity(entity); + this.authorization.checkWrite(grantEntity); + return Result.of(entity); + } + + @Override + protected Result validForCreate(final ExamConfigurationMap entity) { + return super.validForCreate(entity) + .map(this::checkPasswordMatch); + } + + @Override + protected Result validForSave(final ExamConfigurationMap entity) { + return super.validForSave(entity) + .map(this::checkPasswordMatch); + } + + private ExamConfigurationMap checkPasswordMatch(final ExamConfigurationMap entity) { + if (entity.hasEncryptionSecret() && !entity.encryptSecret.equals(entity.confirmEncryptSecret)) { + throw new APIMessageException(APIMessage.fieldValidationError( + new FieldError( + Domain.EXAM_CONFIGURATION_MAP.TYPE_NAME, + PasswordChange.ATTR_NAME_PASSWORD, + "examConfigMapping:confirm_encrypt_secret:password.mismatch"))); + } + + return entity; + } + +} diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 6732e023..881c8579 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -272,7 +272,27 @@ sebserver.exam.status.UP_COMING=Up Coming sebserver.exam.status.RUNNING=Running sebserver.exam.status.FINISHED=Finished -sebserver.exam.indicator.list.actions=Selected Indicator +sebserver.exam.configuration.list.actions=SEB Configuration +sebserver.exam.configuration.list.title=SEB Configuration +sebserver.exam.configuration.list.column.name=Name +sebserver.exam.configuration.list.column.description=Description +sebserver.exam.configuration.list.column.status=Status +sebserver.exam.configuration.list.empty=There is currently no SEB Configuration defined for this Exam. Please add one + +sebserver.exam.configuration.action.list.new=Add +sebserver.exam.configuration.action.list.modify=Edit +sebserver.exam.configuration.action.list.delete=Delete +sebserver.exam.configuration.action.save=Save + +sebserver.exam.configuration.form.title.new=Add SEB Configuration Mapping +sebserver.exam.configuration.form.title=SEB Configuration Mapping +sebserver.exam.configuration.form.name=SEB Configuration +sebserver.exam.configuration.form.encryptSecret=Encryption Password +sebserver.exam.configuration.form.description=Description +sebserver.exam.configuration.form.status=Status +sebserver.exam.configuration.form.encryptSecret.confirm=Confirm Password + +sebserver.exam.indicator.list.actions=Indicator sebserver.exam.indicator.list.title=Indicators sebserver.exam.indicator.list.column.type=Type sebserver.exam.indicator.list.column.name=Name @@ -285,9 +305,9 @@ sebserver.exam.indicator.type.ERROR_COUNT=Error Count sebserver.exam.indicator.info.pleaseSelect=Please Select an Indicator first -sebserver.exam.indicator.action.list.new=New Indicator -sebserver.exam.indicator.action.list.modify=Edit -sebserver.exam.indicator.action.list.delete=Delete +sebserver.exam.indicator.action.list.new=New +sebserver.exam.indicator.action.list.modify=Edit Selected +sebserver.exam.indicator.action.list.delete=Delete Selected sebserver.exam.indicator.action.save=Save sebserver.exam.indicator.form.title=Indicator diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties index 37e89037..a0553633 100644 --- a/src/main/resources/messages_en.properties +++ b/src/main/resources/messages_en.properties @@ -40,7 +40,6 @@ sebserver.error.unexpected=Unexpected Error sebserver.page.message=Information sebserver.dialog.confirm.title=Confirmation -sebserver.dialog.confirm.deactivation=Note that there are {0} other entities that belong to this entity.
These will also be deactivated by deactivating this entity.

Are You sure you want to deactivate this entity? sebserver.dialog.confirm.deactivation.noDependencies=Are You sure you want to deactivate? ################################ @@ -266,7 +265,7 @@ sebserver.exam.type.MANAGED=Managed Devices sebserver.exam.type.BYOD=Bring Your Own Device sebserver.exam.type.VDI=VDI (Virtual Desktop Infrastructure) -sebserver.exam.indicator.list.actions=Selected Indicator +sebserver.exam.indicator.list.actions=Indicator sebserver.exam.indicator.list.title=Indicators sebserver.exam.indicator.list.column.type=Type sebserver.exam.indicator.list.column.name=Name @@ -279,9 +278,9 @@ sebserver.exam.indicator.type.ERROR_COUNT=Error Count sebserver.exam.indicator.info.pleaseSelect=Please select an indicator first -sebserver.exam.indicator.action.list.new=New Indicator -sebserver.exam.indicator.action.list.modify=Edit -sebserver.exam.indicator.action.list.delete=Delete +sebserver.exam.indicator.action.list.new=New +sebserver.exam.indicator.action.list.modify=Edit Selected +sebserver.exam.indicator.action.list.delete=Delete Selected sebserver.exam.indicator.action.save=Save sebserver.exam.indicator.form.title=Indicator diff --git a/src/main/resources/static/images/no.png b/src/main/resources/static/images/no.png new file mode 100644 index 0000000000000000000000000000000000000000..3ddfaf8a2774ce17e993742f19b2d707fc57aa34 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@RheXipc%kP60RiAaYAsjMH3KjZ|y zKMuUiA9~pT#D+43fBlCy)UAlI&U@Qpx@B?q#HV7T&TEpP!>gTe~DWM4f2a7RT literal 0 HcmV?d00001 diff --git a/src/main/resources/static/images/settings.png b/src/main/resources/static/images/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..39c472f4b9ca6ea2bbf35f0593df7ced636297dd GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m7J9lkhEy=lowQYy$x(!%-QBTe z$&w1j9nsMdk{(UoZNV&xdC%)MU#v5~^FY~wL4KJ`<)2dAGK>{YcRl~V zR>NRHH;=u4^K}r^ z{Vvma^}DuC@r(X3fhUvgQT?L=mJ190{mjm&R<><9b3N(Q&+ILw^;*yNFwDG@?_>Xu R=`hf-44$rjF6*2UngDcJR@VRk literal 0 HcmV?d00001 diff --git a/src/main/resources/static/images/undo.png b/src/main/resources/static/images/undo.png new file mode 100644 index 0000000000000000000000000000000000000000..fac790df8ddf7d63ed5233598a087a8938f3c66e GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mNUVb1Xl^B$@lPH%h6BP^kFQS@*6jS~q+3uHZ%4?FX8X>=_pkZqP^7QRpv+Gf(W z-Qk}so2H4Y!(@vIXT*~%xI}iJJ8; literal 0 HcmV?d00001 diff --git a/src/main/resources/static/images/yes.png b/src/main/resources/static/images/yes.png new file mode 100644 index 0000000000000000000000000000000000000000..dc1dc0631d57cda1f5965498f38a1f67f131e959 GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|myggkULn;`PC5jfzaqOBfsjlrm z4{OWRlFM$L5{DDnd@a_??$#9I*)ADpxMGp^!H{na4<(zGLOA^tm_xoXE@PR$>9~U` fOXGzF9qA0ePf99t?RSU+8q476>gTe~DWM4fxy>p< literal 0 HcmV?d00001 From 74306412e12ee2c6ebd8c3440e1a24d44d978ace Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 28 May 2019 08:20:05 +0200 Subject: [PATCH 4/6] minor refactoring and code cleanup --- .../seb/sebserver/gui/content/MainPage.java | 8 +- .../gui/service/i18n/PolyglotPageService.java | 41 +++ .../i18n/impl/PolyglotPageServiceImpl.java | 234 +++++++++++++++ .../service/page/impl/DefaultPageLayout.java | 2 +- .../seb/sebserver/gui/widget/GridTable.java | 1 + .../gui/widget/MultiSelectionCombo.java | 19 +- .../sebserver/gui/widget/WidgetFactory.java | 279 +++--------------- src/main/resources/messages.properties | 3 + 8 files changed, 335 insertions(+), 252 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java index 009a67fd..3260232d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Component; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; import ch.ethz.seb.sebserver.gui.content.activity.ActivitiesPane; import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; +import ch.ethz.seb.sebserver.gui.service.i18n.PolyglotPageService; import ch.ethz.seb.sebserver.gui.service.page.PageContext; import ch.ethz.seb.sebserver.gui.service.page.PageService; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; @@ -52,13 +53,16 @@ public class MainPage implements TemplateComposer { private static final int[] OPENED_SASH_WEIGHTS = new int[] { 0, 100, 0 }; private final WidgetFactory widgetFactory; + private final PolyglotPageService polyglotPageService; private final PageService pageStateService; public MainPage( final WidgetFactory widgetFactory, + final PolyglotPageService polyglotPageService, final PageService pageStateService) { this.widgetFactory = widgetFactory; + this.polyglotPageService = polyglotPageService; this.pageStateService = pageStateService; } @@ -105,7 +109,7 @@ public class MainPage implements TemplateComposer { mainSash.setWeights(DEFAULT_SASH_WEIGHTS); ib.setData("fullScreen", false); ib.setImage(WidgetFactory.ImageIcon.MAXIMIZE.getImage(ib.getDisplay())); - this.widgetFactory.injectI18n( + this.polyglotPageService.injectI18n( ib, null, new LocTextKey("sebserver.mainpage.maximize.tooltip")); @@ -113,7 +117,7 @@ public class MainPage implements TemplateComposer { mainSash.setWeights(OPENED_SASH_WEIGHTS); ib.setData("fullScreen", true); ib.setImage(WidgetFactory.ImageIcon.MINIMIZE.getImage(ib.getDisplay())); - this.widgetFactory.injectI18n( + this.polyglotPageService.injectI18n( ib, null, new LocTextKey("sebserver.mainpage.minimize.tooltip")); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/PolyglotPageService.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/PolyglotPageService.java index aa0efeac..be2d72ab 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/PolyglotPageService.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/PolyglotPageService.java @@ -10,7 +10,20 @@ package ch.ethz.seb.sebserver.gui.service.i18n; import java.util.Locale; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.TabFolder; +import org.eclipse.swt.widgets.TabItem; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.TreeItem; + +import ch.ethz.seb.sebserver.gui.service.page.PageContext; +import ch.ethz.seb.sebserver.gui.widget.ImageUpload; public interface PolyglotPageService { @@ -36,4 +49,32 @@ public interface PolyglotPageService { * @param locale the Locale to set */ void setPageLocale(Composite root, Locale locale); + void injectI18n(ImageUpload imageUpload, LocTextKey locTextKey); + + void injectI18n(Label label, LocTextKey locTextKey); + + void injectI18n(Label label, LocTextKey locTextKey, LocTextKey locToolTipKey); + + void injectI18n(Group group, LocTextKey locTextKey, LocTextKey locTooltipKey); + + void injectI18n(Button button, LocTextKey locTextKey); + + void injectI18n(Button button, LocTextKey locTextKey, LocTextKey locToolTipKey); + + void injectI18n(Tree tree); + + void injectI18n(TreeItem treeItem, LocTextKey locTextKey); + + void injectI18n(Table table); + + void injectI18n(TabFolder tabFolder); + + void injectI18n(TableColumn tableColumn, LocTextKey locTextKey, LocTextKey locTooltipKey); + + void injectI18n(TableItem tableItem, LocTextKey... locTextKey); + + void injectI18n(TabItem tabItem, LocTextKey locTextKey, LocTextKey locTooltipKey); + + void createLanguageSelector(PageContext composerCtx); + } \ No newline at end of file diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java index 6d8c46eb..2234b605 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java @@ -11,15 +11,31 @@ package ch.ethz.seb.sebserver.gui.service.i18n.impl; import java.util.Locale; import java.util.function.Consumer; +import org.apache.commons.lang3.StringUtils; +import org.eclipse.rap.rwt.RWT; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.TabFolder; +import org.eclipse.swt.widgets.TabItem; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.TreeItem; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport; +import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; import ch.ethz.seb.sebserver.gui.service.i18n.PolyglotPageService; import ch.ethz.seb.sebserver.gui.service.page.ComposerService; +import ch.ethz.seb.sebserver.gui.service.page.PageContext; +import ch.ethz.seb.sebserver.gui.widget.ImageUpload; /** Service that supports page language change on the fly */ @Lazy @@ -55,4 +71,222 @@ public final class PolyglotPageServiceImpl implements PolyglotPageService { root.layout(true, true); } + @Override + public void injectI18n(final ImageUpload imageUpload, final LocTextKey locTextKey) { + final Consumer imageUploadFunction = iu -> { + if (locTextKey != null) { + iu.setSelectionText(this.i18nSupport.getText(locTextKey)); + } + }; + imageUpload.setData(POLYGLOT_WIDGET_FUNCTION_KEY, imageUploadFunction); + imageUploadFunction.accept(imageUpload); + } + + @Override + public void injectI18n(final Label label, final LocTextKey locTextKey) { + injectI18n(label, locTextKey, null); + } + + @Override + public void injectI18n(final Label label, final LocTextKey locTextKey, final LocTextKey locToolTipKey) { + final Consumer