SEBSERV-44 SEBSERV-45 SEB Client Config implementation

src/main/java/ch/ethz/seb/sebserver/gbl/api/API.java

@@ -23,10 +23,15 @@ public final class API {
     public static final String PARAM_PARENT_MODEL_ID = "parentModelId";
     public static final String PARAM_ENTITY_TYPE = "entityType";
     public static final String PARAM_BULK_ACTION_TYPE = "bulkActionType";
+    public static final String PARAM_CLIENT_CONFIG_SECRET = "client_config_secret";
 
     public static final String INSTITUTION_VAR_PATH_SEGMENT = "/{" + PARAM_INSTITUTION_ID + "}";
     public static final String MODEL_ID_VAR_PATH_SEGMENT = "/{" + PARAM_MODEL_ID + "}";
 
+    public static final String OAUTH_TOKEN_ENDPOINT = "/oauth/token"; // TODO to config properties?
+    public static final String OAUTH_REVOKE_TOKEN_ENDPOINT = "/oauth/revoke-token"; // TODO to config properties?
+    public static final String CURRENT_USER_ENDPOINT = API.USER_ACCOUNT_ENDPOINT + "/me";
+
     public static final String INFO_ENDPOINT = "/info";
 
     public static final String LOGO_PATH_SEGMENT = "/logo";
@@ -36,10 +41,10 @@ public final class API {
     public static final String PRIVILEGES_ENDPOINT = INFO_ENDPOINT + PRIVILEGES_PATH_SEGMENT;
 
     public static final String INSTITUTION_ENDPOINT = "/institution";
-    public static final String SEB_CONFIG_EXPORT_PATH_SEGMENT = "/sebconfig";
-    public static final String SEB_CONFIG_EXPORT_ENDPOINT = INSTITUTION_ENDPOINT
-            + INSTITUTION_VAR_PATH_SEGMENT
-            + SEB_CONFIG_EXPORT_PATH_SEGMENT;
+//    public static final String SEB_CONFIG_EXPORT_PATH_SEGMENT = "/sebconfig";
+//    public static final String SEB_CONFIG_EXPORT_ENDPOINT = INSTITUTION_ENDPOINT
+//            + INSTITUTION_VAR_PATH_SEGMENT
+//            + SEB_CONFIG_EXPORT_PATH_SEGMENT;
 
     public static final String LMS_SETUP_ENDPOINT = "/lms_setup";
     public static final String LMS_SETUP_TEST_PATH_SEGMENT = "/test";
@@ -59,6 +64,9 @@ public final class API {
 
     public static final String EXAM_INDICATOR_ENDPOINT = "/indicator";
 
+    public static final String SEB_CLIENT_CONFIG_ENDPOINT = "/client_configuration";
+    public static final String SEB_CLIENT_CONFIG_DOWNLOAD_PATH_SEGMENT = "/download";
+
     public static final String CONFIGURATION_NODE_ENDPOINT = "/configuration_node";
 
     public static final String CONFIGURATION_ENDPOINT = "/configuration";

src/main/java/ch/ethz/seb/sebserver/gbl/api/APIMessage.java

@@ -36,7 +36,7 @@ public class APIMessage implements Serializable {
         ILLEGAL_API_ARGUMENT("1010", HttpStatus.BAD_REQUEST, "Illegal API request argument"),
         UNEXPECTED("1100", HttpStatus.INTERNAL_SERVER_ERROR, "Unexpected intenral server-side error"),
         FIELD_VALIDATION("1200", HttpStatus.BAD_REQUEST, "Field validation error"),
-        PASSWORD_MISMATCH("1300", HttpStatus.BAD_REQUEST, "new password do not match retyped password")
+        PASSWORD_MISMATCH("1300", HttpStatus.BAD_REQUEST, "new password do not match confirmed password")
 
         ;
 

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-04-10T15:17:04.562+02:00")
+@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-04-16T09:31:18.846+02:00")
 public enum EntityType {
     CONFIGURATION_ATTRIBUTE,
     CONFIGURATION_VALUE,

src/main/java/ch/ethz/seb/sebserver/gbl/api/POSTMapper.java

@@ -8,6 +8,7 @@
 
 package ch.ethz.seb.sebserver.gbl.api;
 
+import java.nio.CharBuffer;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -44,6 +45,24 @@ public class POSTMapper {
         return this.params.getFirst(name);
     }
 
+    public char[] getCharArray(final String name) {
+        final String value = getString(name);
+        if (value == null || value.length() <= 0) {
+            return null;
+        }
+
+        return value.toCharArray();
+    }
+
+    public CharSequence getCharSequence(final String name) {
+        final char[] charArray = getCharArray(name);
+        if (charArray == null) {
+            return null;
+        }
+
+        return CharBuffer.wrap(charArray);
+    }
+
     public Long getLong(final String name) {
         final String value = this.params.getFirst(name);
         if (StringUtils.isBlank(value)) {

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-04-10T15:17:04.475+02:00")
+@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-04-16T09:31:18.784+02:00")
 public interface Domain {
 
     interface CONFIGURATION_ATTRIBUTE {
@@ -159,6 +159,7 @@ public interface Domain {
         String ATTR_DATE = "date";
         String ATTR_CLIENT_NAME = "clientName";
         String ATTR_CLIENT_SECRET = "clientSecret";
+        String ATTR_ENCRYPT_SECRET = "encryptSecret";
         String ATTR_ACTIVE = "active";
     }
 

src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/SebClientConfig.java

@@ -6,22 +6,29 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package ch.ethz.seb.sebserver.gbl.model.institution;
+package ch.ethz.seb.sebserver.gbl.model.sebconfig;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 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.Activatable;
+import ch.ethz.seb.sebserver.gbl.model.Domain;
 import ch.ethz.seb.sebserver.gbl.model.Domain.SEB_CLIENT_CONFIGURATION;
 import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.GrantEntity;
 
 public final class SebClientConfig implements GrantEntity, Activatable {
 
-    public static final String FILTER_ATTR_FROM = "from";
+    public static final String ATTR_CONFIRM_ENCRYPT_SECRET = "confirm_encrypt_secret";
+
+    public static final String FILTER_ATTR_CREATION_DATE = "creation_date";
 
     @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ID)
     public final Long id;
@@ -30,15 +37,20 @@ public final class SebClientConfig implements GrantEntity, Activatable {
     @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_INSTITUTION_ID)
     public final Long institutionId;
 
-    @NotNull
+    @NotNull(message = "clientconfig:name:notNull")
+    @Size(min = 3, max = 255, message = "clientconfig:name:size:{min}:{max}:${validatedValue}")
     @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_NAME)
     public final String name;
 
-    @NotNull
     @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_DATE)
     public final DateTime date;
 
-    @NotNull
+    @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET)
+    public final CharSequence encryptSecret;
+
+    @JsonProperty(ATTR_CONFIRM_ENCRYPT_SECRET)
+    public final CharSequence confirmEncryptSecret;
+
     @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ACTIVE)
     public final Boolean active;
 
@@ -47,15 +59,29 @@ public final class SebClientConfig implements GrantEntity, Activatable {
             @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_INSTITUTION_ID) final Long institutionId,
             @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_NAME) final String name,
             @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_DATE) final DateTime date,
+            @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET) final CharSequence encryptSecret,
+            @JsonProperty(ATTR_CONFIRM_ENCRYPT_SECRET) final CharSequence confirmEncryptSecret,
             @JsonProperty(SEB_CLIENT_CONFIGURATION.ATTR_ACTIVE) final Boolean active) {
 
         this.id = id;
         this.institutionId = institutionId;
         this.name = name;
         this.date = date;
+        this.encryptSecret = encryptSecret;
+        this.confirmEncryptSecret = confirmEncryptSecret;
         this.active = active;
     }
 
+    public SebClientConfig(final Long institutionId, final POSTMapper postParams) {
+        this.id = null;
+        this.institutionId = institutionId;
+        this.name = postParams.getString(Domain.SEB_CLIENT_CONFIGURATION.ATTR_NAME);
+        this.date = postParams.getDateTime(Domain.SEB_CLIENT_CONFIGURATION.ATTR_DATE);
+        this.encryptSecret = postParams.getCharSequence(Domain.SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET);
+        this.confirmEncryptSecret = postParams.getCharSequence(ATTR_CONFIRM_ENCRYPT_SECRET);
+        this.active = false;
+    }
+
     @Override
     public EntityType entityType() {
         return EntityType.SEB_CLIENT_CONFIGURATION;
@@ -91,6 +117,19 @@ public final class SebClientConfig implements GrantEntity, Activatable {
         return this.date;
     }
 
+    public CharSequence getEncryptSecret() {
+        return this.encryptSecret;
+    }
+
+    public CharSequence getConfirmEncryptSecret() {
+        return this.confirmEncryptSecret;
+    }
+
+    @JsonIgnore
+    public boolean hasEncryptionSecret() {
+        return this.encryptSecret != null && this.encryptSecret.length() > 0;
+    }
+
     public Boolean getActive() {
         return this.active;
     }
@@ -102,4 +141,15 @@ public final class SebClientConfig implements GrantEntity, Activatable {
                 + ", active=" + this.active + "]";
     }
 
+    public static final SebClientConfig createNew(final Long institutionId) {
+        return new SebClientConfig(
+                null,
+                institutionId,
+                null,
+                DateTime.now(DateTimeZone.UTC),
+                null,
+                null,
+                false);
+    }
+
 }

src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java

@@ -189,4 +189,15 @@ public final class Utils {
         }
     }
 
+    public static void clearCharArray(final char[] array) {
+        if (array == null) {
+            return;
+        }
+
+        for (int i = 0; i < array.length; i++) {
+            array[i] = 0;
+        }
+
+    }
+
 }

src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionForm.java

@@ -8,8 +8,6 @@
 
 package ch.ethz.seb.sebserver.gui.content;
 
-import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.client.service.UrlLauncher;
 import org.eclipse.swt.widgets.Composite;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,7 +16,6 @@ import org.springframework.stereotype.Component;
 
 import ch.ethz.seb.sebserver.gbl.api.API;
 import ch.ethz.seb.sebserver.gbl.api.EntityType;
-import ch.ethz.seb.sebserver.gbl.authorization.PrivilegeType;
 import ch.ethz.seb.sebserver.gbl.model.Domain;
 import ch.ethz.seb.sebserver.gbl.model.EntityKey;
 import ch.ethz.seb.sebserver.gbl.model.institution.Institution;
@@ -31,7 +28,6 @@ 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.page.impl.PageUtils;
-import ch.ethz.seb.sebserver.gui.service.remote.SebClientConfigDownload;
 import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService;
 import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.ActivateInstitution;
 import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.DeactivateInstitution;
@@ -59,18 +55,15 @@ public class InstitutionForm implements TemplateComposer {
     private final PageService pageService;
     private final RestService restService;
     private final CurrentUser currentUser;
-    private final SebClientConfigDownload sebClientConfigDownload;
 
     protected InstitutionForm(
             final PageService pageService,
             final RestService restService,
-            final CurrentUser currentUser,
-            final SebClientConfigDownload sebClientConfigDownload) {
+            final CurrentUser currentUser) {
 
         this.pageService = pageService;
         this.restService = restService;
         this.currentUser = currentUser;
-        this.sebClientConfigDownload = sebClientConfigDownload;
     }
 
     @Override
@@ -99,9 +92,6 @@ public class InstitutionForm implements TemplateComposer {
         final boolean writeGrant = instGrant.w();
         final boolean modifyGrant = instGrant.m();
         final boolean userWriteGrant = this.currentUser.grantCheck(EntityType.USER).w();
-        final boolean sebConfigWriteGrant = this.currentUser.hasInstitutionalPrivilege(
-                PrivilegeType.WRITE,
-                EntityType.SEB_CLIENT_CONFIGURATION);
         final boolean isReadonly = pageContext.isReadonly();
 
         // new PageContext with actual EntityKey
@@ -145,7 +135,6 @@ public class InstitutionForm implements TemplateComposer {
                         : this.restService.getRestCall(SaveInstitution.class));
 
         // propagate content actions to action-pane
-        final UrlLauncher urlLauncher = RWT.getClient().getService(UrlLauncher.class);
         this.pageService.pageActionBuilder(formContext.clearEntityKeys())
 
                 .newAction(ActionDefinition.INSTITUTION_NEW)
@@ -159,16 +148,6 @@ public class InstitutionForm implements TemplateComposer {
                 .withEntityKey(entityKey)
                 .publishIf(() -> modifyGrant && isReadonly)
 
-                .newAction(ActionDefinition.INSTITUTION_EXPORT_SEB_CONFIG)
-                .withEntityKey(entityKey)
-                .withExec(action -> {
-                    final String downloadURL = this.sebClientConfigDownload.downloadSEBClientConfigURL(
-                            entityKey.modelId);
-                    urlLauncher.openURL(downloadURL);
-                    return action;
-                })
-                .publishIf(() -> sebConfigWriteGrant && isReadonly && institution.isActive())
-
                 .newAction(ActionDefinition.INSTITUTION_DEACTIVATE)
                 .withEntityKey(entityKey)
                 .withSimpleRestCall(this.restService, DeactivateInstitution.class)

src/main/java/ch/ethz/seb/sebserver/gui/content/LmsSetupForm.java

@@ -177,7 +177,7 @@ public class LmsSetupForm implements TemplateComposer {
                 .addField(FormBuilder.text(
                         Domain.LMS_SETUP.ATTR_LMS_CLIENTNAME,
                         FORM_CLIENTNAME_LMS_TEXT_KEY,
-                        lmsSetup.getLmsAuthName()))
+                        (lmsSetup.getLmsAuthName() != null) ? lmsSetup.getLmsAuthName().toString() : null))
                 .addField(FormBuilder.text(
                         Domain.LMS_SETUP.ATTR_LMS_CLIENTSECRET,
                         FORM_SECRET_LMS_TEXT_KEY)

src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientConfigForm.java

@@ -0,0 +1,204 @@
+/*
+ * 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.eclipse.rap.rwt.RWT;
+import org.eclipse.rap.rwt.client.service.UrlLauncher;
+import org.eclipse.swt.widgets.Composite;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.sebconfig.SebClientConfig;
+import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
+import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
+import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition;
+import ch.ethz.seb.sebserver.gui.form.FormBuilder;
+import ch.ethz.seb.sebserver.gui.form.FormHandle;
+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.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.page.impl.PageUtils;
+import ch.ethz.seb.sebserver.gui.service.remote.SebClientConfigDownload;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.ActivateClientConfig;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.DeactivateClientConfig;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.GetClientConfig;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.NewClientConfig;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.SaveClientConfig;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser.EntityGrantCheck;
+import ch.ethz.seb.sebserver.gui.widget.WidgetFactory;
+
+@Lazy
+@Component
+@GuiProfile
+public class SebClientConfigForm implements TemplateComposer {
+
+    private static final Logger log = LoggerFactory.getLogger(LmsSetupForm.class);
+
+    private static final LocTextKey FORM_TITLE_NEW =
+            new LocTextKey("sebserver.clientconfig.form.title.new");
+    private static final LocTextKey FORM_TITLE =
+            new LocTextKey("sebserver.clientconfig.form.title");
+    private static final LocTextKey FORM_NAME_TEXT_KEY =
+            new LocTextKey("sebserver.clientconfig.form.name");
+    private static final LocTextKey FORM_DATE_TEXT_KEY =
+            new LocTextKey("sebserver.clientconfig.form.date");
+    private static final LocTextKey FORM_ENCRYPT_SECRET_TEXT_KEY =
+            new LocTextKey("sebserver.clientconfig.form.encryptSecret");
+    private static final LocTextKey FORM_CONFIRM_ENCRYPT_SECRET_TEXT_KEY =
+            new LocTextKey("sebserver.clientconfig.form.encryptSecret.confirm");
+
+    private final PageService pageService;
+    private final RestService restService;
+    private final CurrentUser currentUser;
+    private final SebClientConfigDownload sebClientConfigDownload;
+
+    protected SebClientConfigForm(
+            final PageService pageService,
+            final RestService restService,
+            final CurrentUser currentUser,
+            final SebClientConfigDownload sebClientConfigDownload) {
+
+        this.pageService = pageService;
+        this.restService = restService;
+        this.currentUser = currentUser;
+        this.sebClientConfigDownload = sebClientConfigDownload;
+    }
+
+    @Override
+    public void compose(final PageContext pageContext) {
+        final WidgetFactory widgetFactory = this.pageService.getWidgetFactory();
+        final I18nSupport i18nSupport = this.pageService.getI18nSupport();
+
+        final UserInfo user = this.currentUser.get();
+        final EntityKey entityKey = pageContext.getEntityKey();
+        final EntityKey parentEntityKey = pageContext.getParentEntityKey();
+
+        final boolean isNew = entityKey == null;
+
+        // get data or create new. Handle error if happen
+        final SebClientConfig clientConfig = (isNew)
+                ? SebClientConfig.createNew((parentEntityKey != null)
+                        ? Long.valueOf(parentEntityKey.modelId)
+                        : user.institutionId)
+                : this.restService
+                        .getBuilder(GetClientConfig.class)
+                        .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId)
+                        .call()
+                        .get(pageContext::notifyError);
+
+        if (clientConfig == null) {
+            log.error("Failed to get SebClientConfig. "
+                    + "Error was notified to the User. "
+                    + "See previous logs for more infomation");
+            return;
+        }
+
+        final EntityGrantCheck entityGrant = this.currentUser.entityGrantCheck(clientConfig);
+        final boolean writeGrant = entityGrant.w();
+        final boolean modifyGrant = entityGrant.m();
+        final boolean isReadonly = pageContext.isReadonly();
+
+        // new PageContext with actual EntityKey
+        final PageContext formContext = pageContext.withEntityKey(clientConfig.getEntityKey());
+
+        // the default page layout with interactive title
+        final LocTextKey titleKey = (isNew)
+                ? FORM_TITLE_NEW
+                : FORM_TITLE;
+        final Composite content = widgetFactory.defaultPageLayout(
+                formContext.getParent(),
+                titleKey);
+
+        // The SebClientConfig form
+        final FormHandle<SebClientConfig> formHandle = this.pageService.formBuilder(
+                formContext.copyOf(content), 4)
+                .readonly(isReadonly)
+                .putStaticValueIf(() -> !isNew,
+                        Domain.SEB_CLIENT_CONFIGURATION.ATTR_ID,
+                        clientConfig.getModelId())
+                .putStaticValue(
+                        Domain.SEB_CLIENT_CONFIGURATION.ATTR_INSTITUTION_ID,
+                        String.valueOf(clientConfig.getInstitutionId()))
+                .addField(FormBuilder.text(
+                        Domain.SEB_CLIENT_CONFIGURATION.ATTR_NAME,
+                        FORM_NAME_TEXT_KEY,
+                        clientConfig.name))
+                .addFieldIf(() -> !isNew,
+                        () -> FormBuilder.text(
+                                Domain.SEB_CLIENT_CONFIGURATION.ATTR_DATE,
+                                FORM_DATE_TEXT_KEY,
+                                i18nSupport.formatDisplayDate(clientConfig.date))
+                                .readonly(true))
+                .addField(FormBuilder.text(
+                        Domain.SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET,
+                        FORM_ENCRYPT_SECRET_TEXT_KEY)
+                        .asPasswordField())
+                .addField(FormBuilder.text(
+                        SebClientConfig.ATTR_CONFIRM_ENCRYPT_SECRET,
+                        FORM_CONFIRM_ENCRYPT_SECRET_TEXT_KEY)
+                        .asPasswordField())
+                .buildFor((isNew)
+                        ? this.restService.getRestCall(NewClientConfig.class)
+                        : this.restService.getRestCall(SaveClientConfig.class));
+
+        final UrlLauncher urlLauncher = RWT.getClient().getService(UrlLauncher.class);
+        this.pageService.pageActionBuilder(formContext.clearEntityKeys())
+
+                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_NEW)
+                .publishIf(() -> writeGrant && isReadonly)
+
+                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_MODIFY)
+                .withEntityKey(entityKey)
+                .publishIf(() -> modifyGrant && isReadonly)
+
+                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_EXPORT)
+                .withEntityKey(entityKey)
+                .withExec(action -> {
+                    final String downloadURL = this.sebClientConfigDownload.downloadSEBClientConfigURL(
+                            entityKey.modelId);
+                    urlLauncher.openURL(downloadURL);
+                    return action;
+                })
+                .publishIf(() -> writeGrant && isReadonly && clientConfig.isActive())
+
+                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_DEACTIVATE)
+                .withEntityKey(entityKey)
+                .withSimpleRestCall(this.restService, DeactivateClientConfig.class)
+                .withConfirm(PageUtils.confirmDeactivation(clientConfig, this.restService))
+                .publishIf(() -> writeGrant && isReadonly && clientConfig.isActive())
+
+                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_ACTIVATE)
+                .withEntityKey(entityKey)
+                .withSimpleRestCall(this.restService, ActivateClientConfig.class)
+                .publishIf(() -> writeGrant && isReadonly && !clientConfig.isActive())
+
+                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_SAVE)
+                .withEntityKey(entityKey)
+                .withExec(formHandle::processFormSave)
+                .ignoreMoveAwayFromEdit()
+                .publishIf(() -> !isReadonly)
+
+                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_CANCEL_MODIFY)
+                .withEntityKey(entityKey)
+                .withExec(action -> this.pageService.onEmptyEntityKeyGoTo(
+                        action,
+                        ActionDefinition.SEB_CLIENT_CONFIG_LIST))
+                .publishIf(() -> !isReadonly);
+    }
+
+}

src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientConfigList.java

@@ -0,0 +1,172 @@
+/*
+ * 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 java.util.function.Function;
+
+import org.eclipse.swt.widgets.Composite;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+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;
+import ch.ethz.seb.sebserver.gbl.model.sebconfig.SebClientConfig;
+import ch.ethz.seb.sebserver.gbl.model.user.UserRole;
+import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
+import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition;
+import ch.ethz.seb.sebserver.gui.service.ResourceService;
+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.page.PageContext;
+import ch.ethz.seb.sebserver.gui.service.page.PageService;
+import ch.ethz.seb.sebserver.gui.service.page.PageService.PageActionBuilder;
+import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer;
+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.seb.clientconfig.GetClientConfigs;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser.GrantCheck;
+import ch.ethz.seb.sebserver.gui.table.ColumnDefinition;
+import ch.ethz.seb.sebserver.gui.table.ColumnDefinition.TableFilterAttribute;
+import ch.ethz.seb.sebserver.gui.table.EntityTable;
+import ch.ethz.seb.sebserver.gui.table.TableFilter.CriteriaType;
+
+@Lazy
+@Component
+@GuiProfile
+public class SebClientConfigList implements TemplateComposer {
+
+    private static final LocTextKey EMPTY_LIST_TEXT_KEY =
+            new LocTextKey("sebserver.clientconfig.list.empty");
+    private static final LocTextKey TITLE_TEXT_KEY =
+            new LocTextKey("sebserver.clientconfig.list.title");
+    private static final LocTextKey INSTITUTION_TEXT_KEY =
+            new LocTextKey("sebserver.clientconfig.list.column.institution");
+    private static final LocTextKey NAME_TEXT_KEY =
+            new LocTextKey("sebserver.clientconfig.list.column.name");
+    private static final LocTextKey ACTIVE_TEXT_KEY =
+            new LocTextKey("sebserver.clientconfig.list.column.active");
+    private static final LocTextKey EMPTY_SELECTION_TEXT_KEY =
+            new LocTextKey("sebserver.clientconfig.info.pleaseSelect");
+
+    private final TableFilterAttribute institutionFilter;
+    private final TableFilterAttribute nameFilter =
+            new TableFilterAttribute(CriteriaType.TEXT, Entity.FILTER_ATTR_NAME);
+    private final TableFilterAttribute dateFilter =
+            new TableFilterAttribute(
+                    CriteriaType.DATE,
+                    SebClientConfig.FILTER_ATTR_CREATION_DATE,
+                    DateTime.now(DateTimeZone.UTC).minusYears(1).toString(Constants.DEFAULT_DATE_TIME_FORMAT));
+
+    private final PageService pageService;
+    private final RestService restService;
+    private final CurrentUser currentUser;
+    private final ResourceService resourceService;
+    private final int pageSize;
+
+    protected SebClientConfigList(
+            final PageService pageService,
+            final RestService restService,
+            final CurrentUser currentUser,
+            @Value("${sebserver.gui.list.page.size}") final Integer pageSize) {
+
+        this.pageService = pageService;
+        this.restService = restService;
+        this.currentUser = currentUser;
+        this.resourceService = pageService.getResourceService();
+        this.pageSize = pageSize;
+
+        this.institutionFilter = new TableFilterAttribute(
+                CriteriaType.SINGLE_SELECTION,
+                Entity.FILTER_ATTR_INSTITUTION,
+                this.resourceService::institutionResource);
+    }
+
+    @Override
+    public void compose(final PageContext pageContext) {
+
+        final I18nSupport i18nSupport = this.pageService.getI18nSupport();
+
+        final Composite content = this.pageService.getWidgetFactory().defaultPageLayout(
+                pageContext.getParent(),
+                TITLE_TEXT_KEY);
+
+        final boolean isSEBAdmin = this.currentUser.get().hasRole(UserRole.SEB_SERVER_ADMIN);
+        final PageActionBuilder pageActionBuilder =
+                this.pageService.pageActionBuilder(pageContext.clearEntityKeys());
+
+        // table
+        final EntityTable<SebClientConfig> table =
+                this.pageService.entityTableBuilder(this.restService.getRestCall(GetClientConfigs.class))
+                        .withEmptyMessage(EMPTY_LIST_TEXT_KEY)
+                        .withPaging(this.pageSize)
+                        .withColumnIf(
+                                () -> isSEBAdmin,
+                                () -> new ColumnDefinition<>(
+                                        Domain.LMS_SETUP.ATTR_INSTITUTION_ID,
+                                        INSTITUTION_TEXT_KEY,
+                                        clientConfigInstitutionNameFunction(this.resourceService),
+                                        this.institutionFilter,
+                                        false))
+                        .withColumn(new ColumnDefinition<>(
+                                Domain.SEB_CLIENT_CONFIGURATION.ATTR_NAME,
+                                NAME_TEXT_KEY,
+                                entity -> entity.name,
+                                this.nameFilter,
+                                true))
+                        .withColumn(new ColumnDefinition<>(
+                                Domain.SEB_CLIENT_CONFIGURATION.ATTR_DATE,
+                                new LocTextKey(
+                                        "sebserver.clientconfig.list.column.date",
+                                        i18nSupport.getUsersTimeZoneTitleSuffix()),
+                                entity -> entity.date,
+                                this.dateFilter,
+                                true))
+                        .withColumn(new ColumnDefinition<>(
+                                Domain.SEB_CLIENT_CONFIGURATION.ATTR_ACTIVE,
+                                ACTIVE_TEXT_KEY,
+                                entity -> this.pageService
+                                        .getResourceService()
+                                        .localizedActivityResource().apply(entity.active),
+                                true))
+                        .withDefaultAction(pageActionBuilder
+                                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_VIEW_FROM_LIST)
+                                .create())
+                        .compose(content);
+
+        final GrantCheck clientConfigGrant = this.currentUser.grantCheck(EntityType.SEB_CLIENT_CONFIGURATION);
+
+        pageActionBuilder
+
+                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_NEW)
+                .publishIf(clientConfigGrant::w)
+
+                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_VIEW_FROM_LIST)
+                .withSelect(table::getSelection, PageAction::applySingleSelection, EMPTY_SELECTION_TEXT_KEY)
+                .publishIf(() -> table.hasAnyContent())
+
+                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_MODIFY_FROM_LIST)
+                .withSelect(table::getSelection, PageAction::applySingleSelection, EMPTY_SELECTION_TEXT_KEY)
+                .publishIf(() -> clientConfigGrant.m() && table.hasAnyContent());
+
+    }
+
+    private static Function<SebClientConfig, String> clientConfigInstitutionNameFunction(
+            final ResourceService resourceService) {
+
+        return config -> resourceService.getInstitutionNameFunction()
+                .apply(String.valueOf(config.institutionId));
+    }
+
+}

src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigList.java

@@ -0,0 +1,33 @@
+/*
+ * 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.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
+import ch.ethz.seb.sebserver.gui.service.page.PageContext;
+import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer;
+
+@Lazy
+@Component
+@GuiProfile
+public class SebExamConfigList implements TemplateComposer {
+
+    public SebExamConfigList() {
+        // TODO Auto-generated constructor stub
+    }
+
+    @Override
+    public void compose(final PageContext pageContext) {
+        // TODO Auto-generated method stub
+
+    }
+
+}

src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java

@@ -18,6 +18,8 @@ public enum ActionCategory {
     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),
+    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),
     ;
 

src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java

@@ -61,11 +61,6 @@ public enum ActionDefinition {
             ImageIcon.ACTIVE,
             PageStateDefinition.INSTITUTION_VIEW,
             ActionCategory.FORM),
-    INSTITUTION_EXPORT_SEB_CONFIG(
-            new LocTextKey("sebserver.institution.action.export.sebconfig"),
-            ImageIcon.SAVE,
-            PageStateDefinition.INSTITUTION_VIEW,
-            ActionCategory.FORM),
 
     USER_ACCOUNT_VIEW_LIST(
             new LocTextKey("sebserver.useraccount.action.list"),
@@ -258,6 +253,58 @@ public enum ActionDefinition {
             PageStateDefinition.EXAM_VIEW,
             ActionCategory.FORM),
 
+    SEB_CLIENT_CONFIG_LIST(
+            new LocTextKey("sebserver.clientconfig.action.list"),
+            PageStateDefinition.SEB_CLIENT_CONFIG_LIST),
+    SEB_CLIENT_CONFIG_NEW(
+            new LocTextKey("sebserver.clientconfig.action.list.new"),
+            ImageIcon.NEW,
+            PageStateDefinition.SEB_CLIENT_CONFIG_EDIT),
+    SEB_CLIENT_CONFIG_VIEW_FROM_LIST(
+            new LocTextKey("sebserver.clientconfig.action.list.view"),
+            ImageIcon.SHOW,
+            PageStateDefinition.SEB_CLIENT_CONFIG_VIEW,
+            ActionCategory.SEB_CLIENT_CONFIG_LIST),
+    SEB_CLIENT_CONFIG_MODIFY_FROM_LIST(
+            new LocTextKey("sebserver.clientconfig.action.list.modify"),
+            ImageIcon.EDIT,
+            PageStateDefinition.SEB_CLIENT_CONFIG_EDIT,
+            ActionCategory.SEB_CLIENT_CONFIG_LIST),
+    SEB_CLIENT_CONFIG_MODIFY(
+            new LocTextKey("sebserver.clientconfig.action.modify"),
+            ImageIcon.EDIT,
+            PageStateDefinition.SEB_CLIENT_CONFIG_EDIT,
+            ActionCategory.FORM),
+    SEB_CLIENT_CONFIG_CANCEL_MODIFY(
+            new LocTextKey("sebserver.overall.action.modify.cancel"),
+            ImageIcon.CANCEL,
+            PageStateDefinition.SEB_CLIENT_CONFIG_VIEW,
+            ActionCategory.FORM),
+    SEB_CLIENT_CONFIG_SAVE(
+            new LocTextKey("sebserver.clientconfig.action.save"),
+            ImageIcon.SAVE,
+            PageStateDefinition.SEB_CLIENT_CONFIG_VIEW,
+            ActionCategory.FORM),
+    SEB_CLIENT_CONFIG_ACTIVATE(
+            new LocTextKey("sebserver.clientconfig.action.activate"),
+            ImageIcon.INACTIVE,
+            PageStateDefinition.SEB_CLIENT_CONFIG_VIEW,
+            ActionCategory.FORM),
+    SEB_CLIENT_CONFIG_DEACTIVATE(
+            new LocTextKey("sebserver.clientconfig.action.deactivate"),
+            ImageIcon.ACTIVE,
+            PageStateDefinition.SEB_CLIENT_CONFIG_VIEW,
+            ActionCategory.FORM),
+    SEB_CLIENT_CONFIG_EXPORT(
+            new LocTextKey("sebserver.clientconfig.action.export"),
+            ImageIcon.SAVE,
+            PageStateDefinition.SEB_CLIENT_CONFIG_VIEW,
+            ActionCategory.FORM),
+
+    SEB_EXAM_CONFIG_LIST(
+            new LocTextKey("sebserver.examconfig.action.list"),
+            PageStateDefinition.SEB_EXAM_CONFIG_LIST),
+
     ;
 
     public final LocTextKey title;

src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java

@@ -167,6 +167,44 @@ public class ActivitiesPane implements TemplateComposer {
                             .create());
         }
 
+        // SEB Configurations
+        final boolean clientConfigRead = this.currentUser.hasInstitutionalPrivilege(
+                PrivilegeType.READ,
+                EntityType.SEB_CLIENT_CONFIGURATION);
+        final boolean examConfigRead = this.currentUser.hasInstitutionalPrivilege(
+                PrivilegeType.READ,
+                EntityType.CONFIGURATION_NODE);
+        if (clientConfigRead || examConfigRead) {
+            final TreeItem sebConfigs = this.widgetFactory.treeItemLocalized(
+                    navigation,
+                    ActivityDefinition.SEB_CONFIGURATION.displayName);
+
+            // SEB Client Config
+            if (clientConfigRead) {
+                final TreeItem clientConfig = this.widgetFactory.treeItemLocalized(
+                        sebConfigs,
+                        ActivityDefinition.SEB_CLIENT_CONFIG.displayName);
+                injectActivitySelection(
+                        clientConfig,
+                        actionBuilder
+                                .newAction(ActionDefinition.SEB_CLIENT_CONFIG_LIST)
+                                .create());
+            }
+
+            // SEB Exam Config
+            if (examConfigRead) {
+                final TreeItem examConfig = this.widgetFactory.treeItemLocalized(
+                        sebConfigs,
+                        ActivityDefinition.SEB_EXAM_CONFIG.displayName);
+                injectActivitySelection(
+                        examConfig,
+                        actionBuilder
+                                .newAction(ActionDefinition.SEB_EXAM_CONFIG_LIST)
+                                .create());
+            }
+
+        }
+
         // TODO other activities
 
         // register page listener and initialize navigation data
@@ -190,13 +228,20 @@ public class ActivitiesPane implements TemplateComposer {
     }
 
     private void handleSelection(final PageContext composerCtx, final Event event) {
+        final Tree tree = (Tree) event.widget;
         final TreeItem treeItem = (TreeItem) event.item;
         final PageAction action = getActivitySelection(treeItem);
+        // if there is no form action associated with the treeItem and the treeItem has sub items, toggle the item state
+        if (action == null) {
+            if (treeItem.getItemCount() > 0) {
+                treeItem.setExpanded(!treeItem.getExpanded());
+            }
+            return;
+        }
         this.pageService.executePageAction(
                 action,
                 result -> {
                     if (result.hasError()) {
-                        final Tree tree = (Tree) event.widget;
                         tree.deselect(treeItem);
                         final PageState currentState = this.pageService.getCurrentState();
                         if (currentState != null) {

src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivityDefinition.java

@@ -17,7 +17,9 @@ public enum ActivityDefinition implements Activity {
     LMS_SETUP(new LocTextKey("sebserver.lmssetup.action.list")),
     QUIZ_DISCOVERY(new LocTextKey("sebserver.quizdiscovery.action.list")),
     EXAM(new LocTextKey("sebserver.exam.action.list")),
-    ;
+    SEB_CONFIGURATION(new LocTextKey("sebserver.sebconfig.activity.name")),
+    SEB_CLIENT_CONFIG(new LocTextKey("sebserver.clientconfig.action.list")),
+    SEB_EXAM_CONFIG(new LocTextKey("sebserver.examconfig.action.list"));
 
     public final LocTextKey displayName;
 

src/main/java/ch/ethz/seb/sebserver/gui/content/activity/PageStateDefinition.java

@@ -16,6 +16,9 @@ import ch.ethz.seb.sebserver.gui.content.InstitutionList;
 import ch.ethz.seb.sebserver.gui.content.LmsSetupForm;
 import ch.ethz.seb.sebserver.gui.content.LmsSetupList;
 import ch.ethz.seb.sebserver.gui.content.QuizDiscoveryList;
+import ch.ethz.seb.sebserver.gui.content.SebClientConfigForm;
+import ch.ethz.seb.sebserver.gui.content.SebClientConfigList;
+import ch.ethz.seb.sebserver.gui.content.SebExamConfigList;
 import ch.ethz.seb.sebserver.gui.content.UserAccountChangePasswordForm;
 import ch.ethz.seb.sebserver.gui.content.UserAccountForm;
 import ch.ethz.seb.sebserver.gui.content.UserAccountList;
@@ -46,6 +49,12 @@ public enum PageStateDefinition implements PageState {
     EXAM_EDIT(Type.FORM_EDIT, ExamForm.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),
+    SEB_CLIENT_CONFIG_VIEW(Type.FORM_VIEW, SebClientConfigForm.class, ActivityDefinition.SEB_CLIENT_CONFIG),
+    SEB_CLIENT_CONFIG_EDIT(Type.FORM_EDIT, SebClientConfigForm.class, ActivityDefinition.SEB_CLIENT_CONFIG),
+
+    SEB_EXAM_CONFIG_LIST(Type.LIST_VIEW, SebExamConfigList.class, ActivityDefinition.SEB_EXAM_CONFIG)
+
     ;
 
     public final Type type;

src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ModalInputDialog.java

@@ -77,9 +77,15 @@ public class ModalInputDialog<T> extends Dialog {
         ok.setLayoutData(data);
         ok.addListener(SWT.Selection, event -> {
             if (valueSuppier != null) {
-                callback.accept(valueSuppier.get());
+                final T result = valueSuppier.get();
+                if (result != null) {
+                    callback.accept(result);
+                    shell.close();
+                }
+
+            } else {
+                shell.close();
             }
-            shell.close();
         });
 
         shell.setDefaultButton(ok);

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/DownloadService.java

@@ -42,7 +42,7 @@ public class DownloadService implements ServiceHandler {
     protected DownloadService(final Collection<DownloadServiceHandler> handler) {
         this.handler = handler
                 .stream()
-                .collect(Collectors.toMap(h -> h.getName(), Function.identity()));
+                .collect(Collectors.toMap(h -> h.getFileName(), Function.identity()));
     }
 
     @Override

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/DownloadServiceHandler.java

@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 
 public interface DownloadServiceHandler {
 
-    String getName();
+    String getFileName();
 
     void processDownload(final HttpServletRequest request, final HttpServletResponse response);
 

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/SebClientConfigDownload.java

@@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -24,7 +25,7 @@ import ch.ethz.seb.sebserver.gbl.Constants;
 import ch.ethz.seb.sebserver.gbl.api.API;
 import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
 import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService;
-import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.ExportSEBConfig;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.ExportClientConfig;
 
 @Lazy
 @Component
@@ -33,18 +34,20 @@ public class SebClientConfigDownload implements DownloadServiceHandler {
 
     private static final Logger log = LoggerFactory.getLogger(SebClientConfigDownload.class);
 
-    // TODO must this be configurable?
-    public static final String SEB_CLIENT_CONFIG_FILE_NAME = "SebClientSettings.seb";
-
     private final RestService restService;
+    public final String downloadFileName;
+
+    protected SebClientConfigDownload(
+            final RestService restService,
+            @Value("${sebserver.gui.seb.client.config.download.filename}") final String downloadFileName) {
 
-    protected SebClientConfigDownload(final RestService restService) {
         this.restService = restService;
+        this.downloadFileName = downloadFileName;
     }
 
     @Override
-    public String getName() {
-        return SEB_CLIENT_CONFIG_FILE_NAME;
+    public String getFileName() {
+        return this.downloadFileName;
     }
 
     @Override
@@ -53,18 +56,18 @@ public class SebClientConfigDownload implements DownloadServiceHandler {
 
             log.debug("download requested... trying to get needed parameter from request");
 
-            final String modelId = request.getParameter(API.PARAM_INSTITUTION_ID);
-            if (StringUtils.isBlank(modelId)) {
+            final String configId = request.getParameter(API.PARAM_MODEL_ID);
+            if (StringUtils.isBlank(configId)) {
                 log.error(
                         "Mandatory modelId parameter not found within HttpServletRequest. Download request is ignored");
                 return;
             }
 
-            log.debug("Found modelId: {} for {} download. Trying to request webservice...", modelId,
-                    SEB_CLIENT_CONFIG_FILE_NAME);
+            log.debug("Found modelId: {} for {} download. Trying to request webservice...", configId,
+                    this.downloadFileName);
 
-            final byte[] configFile = this.restService.getBuilder(ExportSEBConfig.class)
-                    .withURIVariable(API.PARAM_INSTITUTION_ID, modelId)
+            final byte[] configFile = this.restService.getBuilder(ExportClientConfig.class)
+                    .withURIVariable(API.PARAM_MODEL_ID, configId)
                     .call()
                     .getOrThrow();
 
@@ -79,7 +82,7 @@ public class SebClientConfigDownload implements DownloadServiceHandler {
             response.setContentLength(configFile.length);
             response.setHeader(
                     HttpHeaders.CONTENT_DISPOSITION,
-                    "attachment; filename=\"" + SEB_CLIENT_CONFIG_FILE_NAME + "\"");
+                    "attachment; filename=\"" + this.downloadFileName + "\"");
 
             log.debug("Write the SEB Client configuration to response output");
 
@@ -97,13 +100,13 @@ public class SebClientConfigDownload implements DownloadServiceHandler {
                 .append(RWT.getServiceManager()
                         .getServiceHandlerUrl(DownloadService.DOWNLOAD_SERVICE_NAME))
                 .append(Constants.FORM_URL_ENCODED_SEPARATOR)
-                .append(API.PARAM_INSTITUTION_ID)
+                .append(API.PARAM_MODEL_ID)
                 .append(Constants.FORM_URL_ENCODED_NAME_VALUE_SEPARATOR)
                 .append(modelId)
                 .append(Constants.FORM_URL_ENCODED_SEPARATOR)
                 .append(DownloadService.HANDLER_NAME_PARAMETER)
                 .append(Constants.FORM_URL_ENCODED_NAME_VALUE_SEPARATOR)
-                .append(SebClientConfigDownload.SEB_CLIENT_CONFIG_FILE_NAME);
+                .append(this.downloadFileName);
         return url.toString();
     }
 

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/seb/clientconfig/ActivateClientConfig.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.seb.clientconfig;
+
+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 ActivateClientConfig extends RestCall<EntityProcessingReport> {
+
+    protected ActivateClientConfig() {
+        super(new TypeKey<>(
+                CallType.ACTIVATION_ACTIVATE,
+                EntityType.SEB_CLIENT_CONFIGURATION,
+                new TypeReference<EntityProcessingReport>() {
+                }),
+                HttpMethod.POST,
+                MediaType.APPLICATION_FORM_URLENCODED,
+                API.SEB_CLIENT_CONFIG_ENDPOINT + API.PATH_VAR_ACTIVE);
+    }
+
+}

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/seb/clientconfig/DeactivateClientConfig.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.seb.clientconfig;
+
+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 DeactivateClientConfig extends RestCall<EntityProcessingReport> {
+
+    protected DeactivateClientConfig() {
+        super(new TypeKey<>(
+                CallType.ACTIVATION_DEACTIVATE,
+                EntityType.SEB_CLIENT_CONFIGURATION,
+                new TypeReference<EntityProcessingReport>() {
+                }),
+                HttpMethod.POST,
+                MediaType.APPLICATION_FORM_URLENCODED,
+                API.SEB_CLIENT_CONFIG_ENDPOINT + API.PATH_VAR_INACTIVE);
+    }
+
+}

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/seb/clientconfig/ExportClientConfig.java

@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution;
+package ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig;
 
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpMethod;
@@ -26,9 +26,9 @@ import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall;
 @Lazy
 @Component
 @GuiProfile
-public class ExportSEBConfig extends RestCall<byte[]> {
+public class ExportClientConfig extends RestCall<byte[]> {
 
-    protected ExportSEBConfig() {
+    protected ExportClientConfig() {
         super(new TypeKey<>(
                 CallType.UNDEFINED,
                 EntityType.INSTITUTION,
@@ -36,7 +36,9 @@ public class ExportSEBConfig extends RestCall<byte[]> {
                 }),
                 HttpMethod.GET,
                 MediaType.APPLICATION_FORM_URLENCODED,
-                API.SEB_CONFIG_EXPORT_ENDPOINT);
+                API.SEB_CLIENT_CONFIG_ENDPOINT 
+                + API.SEB_CLIENT_CONFIG_DOWNLOAD_PATH_SEGMENT
+                + API.MODEL_ID_VAR_PATH_SEGMENT);
     }
 
     @Override

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/seb/clientconfig/GetClientConfig.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.seb.clientconfig;
+
+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.sebconfig.SebClientConfig;
+import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall;
+
+@Lazy
+@Component
+@GuiProfile
+public class GetClientConfig extends RestCall<SebClientConfig> {
+
+    protected GetClientConfig() {
+        super(new TypeKey<>(
+                CallType.GET_SINGLE,
+                EntityType.SEB_CLIENT_CONFIGURATION,
+                new TypeReference<SebClientConfig>() {
+                }),
+                HttpMethod.GET,
+                MediaType.APPLICATION_FORM_URLENCODED,
+                API.SEB_CLIENT_CONFIG_ENDPOINT + API.MODEL_ID_VAR_PATH_SEGMENT);
+    }
+
+}

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/seb/clientconfig/GetClientConfigs.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.seb.clientconfig;
+
+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.sebconfig.SebClientConfig;
+import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall;
+
+@Lazy
+@Component
+@GuiProfile
+public class GetClientConfigs extends RestCall<Page<SebClientConfig>> {
+
+    protected GetClientConfigs() {
+        super(new TypeKey<>(
+                CallType.GET_PAGE,
+                EntityType.SEB_CLIENT_CONFIGURATION,
+                new TypeReference<Page<SebClientConfig>>() {
+                }),
+                HttpMethod.GET,
+                MediaType.APPLICATION_FORM_URLENCODED,
+                API.SEB_CLIENT_CONFIG_ENDPOINT);
+    }
+
+}

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/seb/clientconfig/NewClientConfig.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.seb.clientconfig;
+
+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.sebconfig.SebClientConfig;
+import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall;
+
+@Lazy
+@Component
+@GuiProfile
+public class NewClientConfig extends RestCall<SebClientConfig> {
+
+    protected NewClientConfig() {
+        super(new TypeKey<>(
+                CallType.NEW,
+                EntityType.SEB_CLIENT_CONFIGURATION,
+                new TypeReference<SebClientConfig>() {
+                }),
+                HttpMethod.POST,
+                MediaType.APPLICATION_FORM_URLENCODED,
+                API.SEB_CLIENT_CONFIG_ENDPOINT);
+    }
+
+}

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/seb/clientconfig/SaveClientConfig.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.seb.clientconfig;
+
+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.sebconfig.SebClientConfig;
+import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
+import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestCall;
+
+@Lazy
+@Component
+@GuiProfile
+public class SaveClientConfig extends RestCall<SebClientConfig> {
+
+    protected SaveClientConfig() {
+        super(new TypeKey<>(
+                CallType.SAVE,
+                EntityType.SEB_CLIENT_CONFIGURATION,
+                new TypeReference<SebClientConfig>() {
+                }),
+                HttpMethod.PUT,
+                MediaType.APPLICATION_JSON_UTF8,
+                API.SEB_CLIENT_CONFIG_ENDPOINT);
+    }
+
+}

src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/auth/WebserviceURIService.java

@@ -19,10 +19,6 @@ import ch.ethz.seb.sebserver.gbl.profile.GuiProfile;
 @GuiProfile
 public class WebserviceURIService {
 
-    private static final String OAUTH_TOKEN_URI_PATH = "oauth/token"; // TODO to config properties?
-    private static final String OAUTH_REVOKE_TOKEN_URI_PATH = "/oauth/revoke-token"; // TODO to config properties?
-    private static final String CURRENT_USER_URI_PATH = API.USER_ACCOUNT_ENDPOINT + "/me";
-
     private final String webserviceServerAddress;
     private final UriComponentsBuilder webserviceURIBuilder;
 
@@ -49,19 +45,19 @@ public class WebserviceURIService {
 
     public String getOAuthTokenURI() {
         return UriComponentsBuilder.fromHttpUrl(this.webserviceServerAddress)
-                .path(OAUTH_TOKEN_URI_PATH)
+                .path(API.OAUTH_TOKEN_ENDPOINT)
                 .toUriString();
     }
 
     public String getOAuthRevokeTokenURI() {
         return UriComponentsBuilder.fromHttpUrl(this.webserviceServerAddress)
-                .path(OAUTH_REVOKE_TOKEN_URI_PATH)
+                .path(API.OAUTH_REVOKE_TOKEN_ENDPOINT)
                 .toUriString();
     }
 
     public String getCurrentUserRequestURI() {
         return getURIBuilder()
-                .path(CURRENT_USER_URI_PATH)
+                .path(API.CURRENT_USER_ENDPOINT)
                 .toUriString();
     }
 }

src/main/java/ch/ethz/seb/sebserver/gui/table/ColumnDefinition.java

@@ -128,6 +128,14 @@ public final class ColumnDefinition<ROW extends Entity> {
             this(type, columnName, "", resourceSupplier);
         }
 
+        public TableFilterAttribute(
+                final CriteriaType type,
+                final String columnName,
+                final String initValue) {
+
+            this(type, columnName, initValue, null);
+        }
+
         public TableFilterAttribute(
                 final CriteriaType type,
                 final String columnName,

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-04-10T15:17:04.779+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source Table: additional_attributes")
     public static final AdditionalAttributes additionalAttributes = new AdditionalAttributes();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.id")
     public static final SqlColumn<Long> id = additionalAttributes.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.780+02:00", comments="Source field: additional_attributes.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.entity_type")
     public static final SqlColumn<String> entityType = additionalAttributes.entityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.780+02:00", comments="Source field: additional_attributes.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.entity_id")
     public static final SqlColumn<Long> entityId = additionalAttributes.entityId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.780+02:00", comments="Source field: additional_attributes.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+02:00", comments="Source field: additional_attributes.name")
     public static final SqlColumn<String> name = additionalAttributes.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.780+02:00", comments="Source field: additional_attributes.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+02:00", comments="Source field: additional_attributes.value")
     public static final SqlColumn<String> value = additionalAttributes.value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source Table: additional_attributes")
     public static final class AdditionalAttributes extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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<AdditionalAttributes> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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<AdditionalAttributes> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+02:00", comments="Source Table: additional_attributes")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(additionalAttributes);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+02:00", comments="Source Table: additional_attributes")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributes);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+02:00", comments="Source Table: additional_attributes")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<AdditionalAttributes>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, entityType, entityId, name, value)
                 .from(additionalAttributes);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+02:00", comments="Source Table: additional_attributes")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<AdditionalAttributes>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, entityType, entityId, name, value)
                 .from(additionalAttributes);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+02:00", comments="Source Table: additional_attributes")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+02:00", comments="Source Table: additional_attributes")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+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-04-10T15:17:04.780+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.015+02:00", comments="Source Table: additional_attributes")
     default int updateByPrimaryKeySelective(AdditionalAttributes record) {
         return UpdateDSL.updateWithMapper(this::update, additionalAttributes)
                 .set(entityType).equalToWhenPresent(record::getEntityType)

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-04-10T15:17:04.718+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.960+02:00", comments="Source Table: client_connection")
     public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.719+02:00", comments="Source field: client_connection.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.960+02:00", comments="Source field: client_connection.id")
     public static final SqlColumn<Long> id = clientConnectionRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.719+02:00", comments="Source field: client_connection.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.961+02:00", comments="Source field: client_connection.exam_id")
     public static final SqlColumn<Long> examId = clientConnectionRecord.examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.719+02:00", comments="Source field: client_connection.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.961+02:00", comments="Source field: client_connection.status")
     public static final SqlColumn<String> status = clientConnectionRecord.status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.719+02:00", comments="Source field: client_connection.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.961+02:00", comments="Source field: client_connection.connection_token")
     public static final SqlColumn<String> connectionToken = clientConnectionRecord.connectionToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.719+02:00", comments="Source field: client_connection.user_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.961+02:00", comments="Source field: client_connection.user_name")
     public static final SqlColumn<String> userName = clientConnectionRecord.userName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.719+02:00", comments="Source field: client_connection.vdi")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.961+02:00", comments="Source field: client_connection.vdi")
     public static final SqlColumn<Boolean> vdi = clientConnectionRecord.vdi;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.720+02:00", comments="Source field: client_connection.client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.961+02:00", comments="Source field: client_connection.client_address")
     public static final SqlColumn<String> clientAddress = clientConnectionRecord.clientAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.720+02:00", comments="Source field: client_connection.virtual_client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.962+02:00", comments="Source field: client_connection.virtual_client_address")
     public static final SqlColumn<String> virtualClientAddress = clientConnectionRecord.virtualClientAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.718+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.960+02:00", comments="Source Table: client_connection")
     public static final class ClientConnectionRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.720+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.962+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-04-10T15:17:04.720+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.962+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-04-10T15:17:04.720+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.962+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<ClientConnectionRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.720+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.962+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-04-10T15:17:04.720+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.962+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<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.720+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.962+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-04-10T15:17:04.720+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.962+02:00", comments="Source Table: client_connection")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(clientConnectionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.720+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.962+02:00", comments="Source Table: client_connection")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.721+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.963+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-04-10T15:17:04.721+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.963+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-04-10T15:17:04.721+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.963+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-04-10T15:17:04.721+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.963+02:00", comments="Source Table: client_connection")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> 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-04-10T15:17:04.721+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.963+02:00", comments="Source Table: client_connection")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> 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-04-10T15:17:04.721+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.963+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-04-10T15:17:04.721+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.963+02:00", comments="Source Table: client_connection")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.721+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.963+02:00", comments="Source Table: client_connection")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.721+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.963+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-04-10T15:17:04.721+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.963+02:00", comments="Source Table: client_connection")
     default int updateByPrimaryKeySelective(ClientConnectionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
                 .set(examId).equalToWhenPresent(record::getExamId)

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-04-10T15:17:04.725+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+02:00", comments="Source Table: client_event")
     public static final ClientEventRecord clientEventRecord = new ClientEventRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.725+02:00", comments="Source field: client_event.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.966+02:00", comments="Source field: client_event.id")
     public static final SqlColumn<Long> id = clientEventRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.725+02:00", comments="Source field: client_event.connection_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.966+02:00", comments="Source field: client_event.connection_id")
     public static final SqlColumn<Long> connectionId = clientEventRecord.connectionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.727+02:00", comments="Source field: client_event.user_identifier")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.966+02:00", comments="Source field: client_event.user_identifier")
     public static final SqlColumn<String> userIdentifier = clientEventRecord.userIdentifier;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.727+02:00", comments="Source field: client_event.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.966+02:00", comments="Source field: client_event.type")
     public static final SqlColumn<Integer> type = clientEventRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.727+02:00", comments="Source field: client_event.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.966+02:00", comments="Source field: client_event.timestamp")
     public static final SqlColumn<Long> timestamp = clientEventRecord.timestamp;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.727+02:00", comments="Source field: client_event.numeric_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.966+02:00", comments="Source field: client_event.numeric_value")
     public static final SqlColumn<BigDecimal> numericValue = clientEventRecord.numericValue;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.727+02:00", comments="Source field: client_event.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.966+02:00", comments="Source field: client_event.text")
     public static final SqlColumn<String> text = clientEventRecord.text;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.725+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+02:00", comments="Source Table: client_event")
     public static final class ClientEventRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.727+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.966+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-04-10T15:17:04.727+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+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-04-10T15:17:04.728+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+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<ClientEventRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.728+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+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-04-10T15:17:04.728+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+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<ClientEventRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.728+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+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-04-10T15:17:04.728+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+02:00", comments="Source Table: client_event")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(clientEventRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.728+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+02:00", comments="Source Table: client_event")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.729+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+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-04-10T15:17:04.729+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+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-04-10T15:17:04.729+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+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-04-10T15:17:04.729+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.967+02:00", comments="Source Table: client_event")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
                 .from(clientEventRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.729+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.968+02:00", comments="Source Table: client_event")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
                 .from(clientEventRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.729+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.968+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-04-10T15:17:04.729+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.968+02:00", comments="Source Table: client_event")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.731+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.968+02:00", comments="Source Table: client_event")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.731+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.968+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-04-10T15:17:04.731+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.968+02:00", comments="Source Table: client_event")
     default int updateByPrimaryKeySelective(ClientEventRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
                 .set(connectionId).equalToWhenPresent(record::getConnectionId)

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-04-10T15:17:04.433+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.751+02:00", comments="Source Table: configuration_attribute")
     public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.436+02:00", comments="Source field: configuration_attribute.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.757+02:00", comments="Source field: configuration_attribute.id")
     public static final SqlColumn<Long> id = configurationAttributeRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.437+02:00", comments="Source field: configuration_attribute.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.758+02:00", comments="Source field: configuration_attribute.name")
     public static final SqlColumn<String> name = configurationAttributeRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.437+02:00", comments="Source field: configuration_attribute.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.758+02:00", comments="Source field: configuration_attribute.type")
     public static final SqlColumn<String> type = configurationAttributeRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.437+02:00", comments="Source field: configuration_attribute.parent_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.758+02:00", comments="Source field: configuration_attribute.parent_id")
     public static final SqlColumn<Long> parentId = configurationAttributeRecord.parentId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.437+02:00", comments="Source field: configuration_attribute.resources")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.758+02:00", comments="Source field: configuration_attribute.resources")
     public static final SqlColumn<String> resources = configurationAttributeRecord.resources;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.438+02:00", comments="Source field: configuration_attribute.validator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.759+02:00", comments="Source field: configuration_attribute.validator")
     public static final SqlColumn<String> validator = configurationAttributeRecord.validator;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.438+02:00", comments="Source field: configuration_attribute.dependencies")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.759+02:00", comments="Source field: configuration_attribute.dependencies")
     public static final SqlColumn<String> dependencies = configurationAttributeRecord.dependencies;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.438+02:00", comments="Source field: configuration_attribute.default_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.759+02:00", comments="Source field: configuration_attribute.default_value")
     public static final SqlColumn<String> defaultValue = configurationAttributeRecord.defaultValue;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.435+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.756+02:00", comments="Source Table: configuration_attribute")
     public static final class ConfigurationAttributeRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.439+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.760+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-04-10T15:17:04.441+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.762+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-04-10T15:17:04.441+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.763+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<ConfigurationAttributeRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.443+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.764+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-04-10T15:17:04.445+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.765+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<ConfigurationAttributeRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.446+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.766+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-04-10T15:17:04.447+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.766+02:00", comments="Source Table: configuration_attribute")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(configurationAttributeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.448+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.767+02:00", comments="Source Table: configuration_attribute")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.449+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.767+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-04-10T15:17:04.450+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.768+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-04-10T15:17:04.452+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.769+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-04-10T15:17:04.453+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.770+02:00", comments="Source Table: configuration_attribute")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> 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-04-10T15:17:04.455+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.771+02:00", comments="Source Table: configuration_attribute")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> 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-04-10T15:17:04.456+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.772+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-04-10T15:17:04.456+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.773+02:00", comments="Source Table: configuration_attribute")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.458+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.774+02:00", comments="Source Table: configuration_attribute")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.459+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.775+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-04-10T15:17:04.462+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.776+02:00", comments="Source Table: configuration_attribute")
     default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
                 .set(name).equalToWhenPresent(record::getName)

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-04-10T15:17:04.701+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.941+02:00", comments="Source Table: configuration_node")
     public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.701+02:00", comments="Source field: configuration_node.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.941+02:00", comments="Source field: configuration_node.id")
     public static final SqlColumn<Long> id = configurationNodeRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.701+02:00", comments="Source field: configuration_node.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.941+02:00", comments="Source field: configuration_node.institution_id")
     public static final SqlColumn<Long> institutionId = configurationNodeRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.701+02:00", comments="Source field: configuration_node.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.941+02:00", comments="Source field: configuration_node.owner")
     public static final SqlColumn<String> owner = configurationNodeRecord.owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.702+02:00", comments="Source field: configuration_node.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.941+02:00", comments="Source field: configuration_node.name")
     public static final SqlColumn<String> name = configurationNodeRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.702+02:00", comments="Source field: configuration_node.description")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.941+02:00", comments="Source field: configuration_node.description")
     public static final SqlColumn<String> description = configurationNodeRecord.description;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.702+02:00", comments="Source field: configuration_node.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+02:00", comments="Source field: configuration_node.type")
     public static final SqlColumn<String> type = configurationNodeRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.702+02:00", comments="Source field: configuration_node.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+02:00", comments="Source field: configuration_node.template")
     public static final SqlColumn<String> template = configurationNodeRecord.template;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.702+02:00", comments="Source field: configuration_node.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+02:00", comments="Source field: configuration_node.active")
     public static final SqlColumn<Integer> active = configurationNodeRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.701+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.941+02:00", comments="Source Table: configuration_node")
     public static final class ConfigurationNodeRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.702+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+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-04-10T15:17:04.702+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+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-04-10T15:17:04.702+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+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<ConfigurationNodeRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.702+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+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-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+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<ConfigurationNodeRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+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-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+02:00", comments="Source Table: configuration_node")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(configurationNodeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+02:00", comments="Source Table: configuration_node")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.942+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-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.943+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-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.943+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-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.943+02:00", comments="Source Table: configuration_node")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active)
                 .from(configurationNodeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.943+02:00", comments="Source Table: configuration_node")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active)
                 .from(configurationNodeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.943+02:00", comments="Source Table: configuration_node")
     default ConfigurationNodeRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, name, description, type, template, active)
                 .from(configurationNodeRecord)
@@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.703+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.943+02:00", comments="Source Table: configuration_node")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationNodeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -159,7 +159,7 @@ public interface ConfigurationNodeRecordMapper {
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.704+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.943+02:00", comments="Source Table: configuration_node")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationNodeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -171,7 +171,7 @@ public interface ConfigurationNodeRecordMapper {
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.704+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.943+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-04-10T15:17:04.704+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.943+02:00", comments="Source Table: configuration_node")
     default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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-04-10T15:17:04.690+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.936+02:00", comments="Source Table: configuration")
     public static final ConfigurationRecord configurationRecord = new ConfigurationRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.691+02:00", comments="Source field: configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.937+02:00", comments="Source field: configuration.id")
     public static final SqlColumn<Long> id = configurationRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.691+02:00", comments="Source field: configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.937+02:00", comments="Source field: configuration.institution_id")
     public static final SqlColumn<Long> institutionId = configurationRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.691+02:00", comments="Source field: configuration.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.937+02:00", comments="Source field: configuration.configuration_node_id")
     public static final SqlColumn<Long> configurationNodeId = configurationRecord.configurationNodeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.691+02:00", comments="Source field: configuration.version")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.937+02:00", comments="Source field: configuration.version")
     public static final SqlColumn<String> version = configurationRecord.version;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.691+02:00", comments="Source field: configuration.version_date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.937+02:00", comments="Source field: configuration.version_date")
     public static final SqlColumn<DateTime> versionDate = configurationRecord.versionDate;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.692+02:00", comments="Source field: configuration.followup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.937+02:00", comments="Source field: configuration.followup")
     public static final SqlColumn<Integer> followup = configurationRecord.followup;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.691+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.936+02:00", comments="Source Table: configuration")
     public static final class ConfigurationRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.692+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.937+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-04-10T15:17:04.692+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.937+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-04-10T15:17:04.692+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+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<ConfigurationRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.692+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+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-04-10T15:17:04.692+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+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<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.694+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+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-04-10T15:17:04.694+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+02:00", comments="Source Table: configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(configurationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.694+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+02:00", comments="Source Table: configuration")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.694+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+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-04-10T15:17:04.694+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+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-04-10T15:17:04.695+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+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-04-10T15:17:04.695+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+02:00", comments="Source Table: configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup)
                 .from(configurationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.695+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+02:00", comments="Source Table: configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup)
                 .from(configurationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.695+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+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-04-10T15:17:04.695+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+02:00", comments="Source Table: configuration")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.695+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.938+02:00", comments="Source Table: configuration")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.696+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.939+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-04-10T15:17:04.696+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.939+02:00", comments="Source Table: configuration")
     default int updateByPrimaryKeySelective(ConfigurationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@@ -6,31 +6,31 @@ 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-04-10T15:17:04.675+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source Table: configuration_value")
     public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.675+02:00", comments="Source field: configuration_value.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.id")
     public static final SqlColumn<Long> id = configurationValueRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.675+02:00", comments="Source field: configuration_value.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.928+02:00", comments="Source field: configuration_value.institution_id")
     public static final SqlColumn<Long> institutionId = configurationValueRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.676+02:00", comments="Source field: configuration_value.configuration_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.928+02:00", comments="Source field: configuration_value.configuration_id")
     public static final SqlColumn<Long> configurationId = configurationValueRecord.configurationId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.676+02:00", comments="Source field: configuration_value.configuration_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.928+02:00", comments="Source field: configuration_value.configuration_attribute_id")
     public static final SqlColumn<Long> configurationAttributeId = configurationValueRecord.configurationAttributeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.676+02:00", comments="Source field: configuration_value.list_index")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.928+02:00", comments="Source field: configuration_value.list_index")
     public static final SqlColumn<Integer> listIndex = configurationValueRecord.listIndex;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.676+02:00", comments="Source field: configuration_value.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.928+02:00", comments="Source field: configuration_value.value")
     public static final SqlColumn<String> value = configurationValueRecord.value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.676+02:00", comments="Source field: configuration_value.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.928+02:00", comments="Source field: configuration_value.text")
     public static final SqlColumn<String> text = configurationValueRecord.text;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.675+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source Table: configuration_value")
     public static final class ConfigurationValueRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.677+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.928+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-04-10T15:17:04.677+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.928+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-04-10T15:17:04.677+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+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<ConfigurationValueRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.677+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+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),
@@ -58,7 +58,7 @@ public interface ConfigurationValueRecordMapper {
     })
     ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.677+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+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),
@@ -71,22 +71,22 @@ public interface ConfigurationValueRecordMapper {
     })
     List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+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-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+02:00", comments="Source Table: configuration_value")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(configurationValueRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+02:00", comments="Source Table: configuration_value")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+02:00", comments="Source Table: configuration_value")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord)
                 .where(id, isEqualTo(id_))
@@ -94,7 +94,7 @@ public interface ConfigurationValueRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+02:00", comments="Source Table: configuration_value")
     default int insert(ConfigurationValueRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationValueRecord)
@@ -108,7 +108,7 @@ public interface ConfigurationValueRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+02:00", comments="Source Table: configuration_value")
     default int insertSelective(ConfigurationValueRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationValueRecord)
@@ -122,19 +122,19 @@ public interface ConfigurationValueRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+02:00", comments="Source Table: configuration_value")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value, text)
                 .from(configurationValueRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+02:00", comments="Source Table: configuration_value")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value, text)
                 .from(configurationValueRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.929+02:00", comments="Source Table: configuration_value")
     default ConfigurationValueRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationId, configurationAttributeId, listIndex, value, text)
                 .from(configurationValueRecord)
@@ -143,7 +143,7 @@ public interface ConfigurationValueRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.930+02:00", comments="Source Table: configuration_value")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -154,7 +154,7 @@ public interface ConfigurationValueRecordMapper {
                 .set(text).equalTo(record::getText);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.930+02:00", comments="Source Table: configuration_value")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -165,7 +165,7 @@ public interface ConfigurationValueRecordMapper {
                 .set(text).equalToWhenPresent(record::getText);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.678+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.930+02:00", comments="Source Table: configuration_value")
     default int updateByPrimaryKey(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -179,7 +179,7 @@ public interface ConfigurationValueRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.679+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.930+02:00", comments="Source Table: configuration_value")
     default int updateByPrimaryKeySelective(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@@ -6,25 +6,25 @@ 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-04-10T15:17:04.706+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.945+02:00", comments="Source Table: exam_configuration_map")
     public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.706+02:00", comments="Source field: exam_configuration_map.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.945+02:00", comments="Source field: exam_configuration_map.id")
     public static final SqlColumn<Long> id = examConfigurationMapRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.706+02:00", comments="Source field: exam_configuration_map.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.945+02:00", comments="Source field: exam_configuration_map.institution_id")
     public static final SqlColumn<Long> institutionId = examConfigurationMapRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.707+02:00", comments="Source field: exam_configuration_map.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.945+02:00", comments="Source field: exam_configuration_map.exam_id")
     public static final SqlColumn<Long> examId = examConfigurationMapRecord.examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.707+02:00", comments="Source field: exam_configuration_map.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.946+02:00", comments="Source field: exam_configuration_map.configuration_node_id")
     public static final SqlColumn<Long> configurationNodeId = examConfigurationMapRecord.configurationNodeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.707+02:00", comments="Source field: exam_configuration_map.user_names")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.946+02:00", comments="Source field: exam_configuration_map.user_names")
     public static final SqlColumn<String> userNames = examConfigurationMapRecord.userNames;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.706+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.945+02:00", comments="Source Table: exam_configuration_map")
     public static final class ExamConfigurationMapRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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

@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ExamConfigurationMapRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.707+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.946+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-04-10T15:17:04.707+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.946+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-04-10T15:17:04.707+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.946+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<ExamConfigurationMapRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.707+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.946+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),
@@ -56,7 +56,7 @@ public interface ExamConfigurationMapRecordMapper {
     })
     ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.707+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.946+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),
@@ -67,22 +67,22 @@ public interface ExamConfigurationMapRecordMapper {
     })
     List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.707+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.947+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-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.947+02:00", comments="Source Table: exam_configuration_map")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(examConfigurationMapRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.948+02:00", comments="Source Table: exam_configuration_map")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.948+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 +90,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.948+02:00", comments="Source Table: exam_configuration_map")
     default int insert(ExamConfigurationMapRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examConfigurationMapRecord)
@@ -102,7 +102,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.948+02:00", comments="Source Table: exam_configuration_map")
     default int insertSelective(ExamConfigurationMapRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examConfigurationMapRecord)
@@ -114,19 +114,19 @@ public interface ExamConfigurationMapRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.948+02:00", comments="Source Table: exam_configuration_map")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames)
                 .from(examConfigurationMapRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.948+02:00", comments="Source Table: exam_configuration_map")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames)
                 .from(examConfigurationMapRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.948+02:00", comments="Source Table: exam_configuration_map")
     default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, userNames)
                 .from(examConfigurationMapRecord)
@@ -135,7 +135,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.948+02:00", comments="Source Table: exam_configuration_map")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -144,7 +144,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .set(userNames).equalTo(record::getUserNames);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.948+02:00", comments="Source Table: exam_configuration_map")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -153,7 +153,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .set(userNames).equalToWhenPresent(record::getUserNames);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.708+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.948+02:00", comments="Source Table: exam_configuration_map")
     default int updateByPrimaryKey(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -165,7 +165,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.709+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.949+02:00", comments="Source Table: exam_configuration_map")
     default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@@ -6,37 +6,37 @@ 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-04-10T15:17:04.712+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.952+02:00", comments="Source Table: exam")
     public static final ExamRecord examRecord = new ExamRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.712+02:00", comments="Source field: exam.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.952+02:00", comments="Source field: exam.id")
     public static final SqlColumn<Long> id = examRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.712+02:00", comments="Source field: exam.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.953+02:00", comments="Source field: exam.institution_id")
     public static final SqlColumn<Long> institutionId = examRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.713+02:00", comments="Source field: exam.lms_setup_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.953+02:00", comments="Source field: exam.lms_setup_id")
     public static final SqlColumn<Long> lmsSetupId = examRecord.lmsSetupId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.713+02:00", comments="Source field: exam.external_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.953+02:00", comments="Source field: exam.external_id")
     public static final SqlColumn<String> externalId = examRecord.externalId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.713+02:00", comments="Source field: exam.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.953+02:00", comments="Source field: exam.owner")
     public static final SqlColumn<String> owner = examRecord.owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.713+02:00", comments="Source field: exam.supporter")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.953+02:00", comments="Source field: exam.supporter")
     public static final SqlColumn<String> supporter = examRecord.supporter;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.713+02:00", comments="Source field: exam.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.953+02:00", comments="Source field: exam.type")
     public static final SqlColumn<String> type = examRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.713+02:00", comments="Source field: exam.quit_password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.954+02:00", comments="Source field: exam.quit_password")
     public static final SqlColumn<String> quitPassword = examRecord.quitPassword;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.713+02:00", comments="Source field: exam.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.954+02:00", comments="Source field: exam.active")
     public static final SqlColumn<Integer> active = examRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.712+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.952+02:00", comments="Source Table: exam")
     public static final class ExamRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.713+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.954+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-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.954+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-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.954+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<ExamRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.954+02:00", comments="Source Table: exam")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -60,7 +60,7 @@ public interface ExamRecordMapper {
     })
     ExamRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -75,22 +75,22 @@ public interface ExamRecordMapper {
     })
     List<ExamRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+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-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(examRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, examRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, examRecord)
                 .where(id, isEqualTo(id_))
@@ -98,7 +98,7 @@ public interface ExamRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     default int insert(ExamRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examRecord)
@@ -114,7 +114,7 @@ public interface ExamRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     default int insertSelective(ExamRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examRecord)
@@ -130,19 +130,19 @@ public interface ExamRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.714+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, active)
                 .from(examRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.715+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, active)
                 .from(examRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.715+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     default ExamRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, active)
                 .from(examRecord)
@@ -151,7 +151,7 @@ public interface ExamRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.715+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -164,7 +164,7 @@ public interface ExamRecordMapper {
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.715+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.955+02:00", comments="Source Table: exam")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -177,7 +177,7 @@ public interface ExamRecordMapper {
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.715+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.956+02:00", comments="Source Table: exam")
     default int updateByPrimaryKey(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -193,7 +193,7 @@ public interface ExamRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.715+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.956+02:00", comments="Source Table: exam")
     default int updateByPrimaryKeySelective(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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-04-10T15:17:04.740+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.972+02:00", comments="Source Table: indicator")
     public static final IndicatorRecord indicatorRecord = new IndicatorRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.740+02:00", comments="Source field: indicator.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.972+02:00", comments="Source field: indicator.id")
     public static final SqlColumn<Long> id = indicatorRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.740+02:00", comments="Source field: indicator.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.972+02:00", comments="Source field: indicator.exam_id")
     public static final SqlColumn<Long> examId = indicatorRecord.examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.740+02:00", comments="Source field: indicator.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.972+02:00", comments="Source field: indicator.type")
     public static final SqlColumn<String> type = indicatorRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.740+02:00", comments="Source field: indicator.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.972+02:00", comments="Source field: indicator.name")
     public static final SqlColumn<String> name = indicatorRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.746+02:00", comments="Source field: indicator.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.973+02:00", comments="Source field: indicator.color")
     public static final SqlColumn<String> color = indicatorRecord.color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.740+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.972+02:00", comments="Source Table: indicator")
     public static final class IndicatorRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.746+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.973+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-04-10T15:17:04.746+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.973+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-04-10T15:17:04.746+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.973+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<IndicatorRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.746+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.973+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-04-10T15:17:04.746+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.973+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<IndicatorRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.747+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.973+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-04-10T15:17:04.747+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+02:00", comments="Source Table: indicator")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(indicatorRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.747+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+02:00", comments="Source Table: indicator")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.747+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+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-04-10T15:17:04.747+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+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-04-10T15:17:04.747+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+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-04-10T15:17:04.747+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+02:00", comments="Source Table: indicator")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<IndicatorRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, examId, type, name, color)
                 .from(indicatorRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.747+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+02:00", comments="Source Table: indicator")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<IndicatorRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, type, name, color)
                 .from(indicatorRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.748+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+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-04-10T15:17:04.748+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+02:00", comments="Source Table: indicator")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.748+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+02:00", comments="Source Table: indicator")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.748+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+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-04-10T15:17:04.748+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.974+02:00", comments="Source Table: indicator")
     default int updateByPrimaryKeySelective(IndicatorRecord record) {
         return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
                 .set(examId).equalToWhenPresent(record::getExamId)

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-04-10T15:17:04.755+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.980+02:00", comments="Source Table: institution")
     public static final InstitutionRecord institutionRecord = new InstitutionRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.981+02:00", comments="Source field: institution.id")
     public static final SqlColumn<Long> id = institutionRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.756+02:00", comments="Source field: institution.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.981+02:00", comments="Source field: institution.name")
     public static final SqlColumn<String> name = institutionRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.756+02:00", comments="Source field: institution.url_suffix")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.981+02:00", comments="Source field: institution.url_suffix")
     public static final SqlColumn<String> urlSuffix = institutionRecord.urlSuffix;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.756+02:00", comments="Source field: institution.theme_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.981+02:00", comments="Source field: institution.theme_name")
     public static final SqlColumn<String> themeName = institutionRecord.themeName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.756+02:00", comments="Source field: institution.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.981+02:00", comments="Source field: institution.active")
     public static final SqlColumn<Integer> active = institutionRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.756+02:00", comments="Source field: institution.logo_image")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.981+02:00", comments="Source field: institution.logo_image")
     public static final SqlColumn<String> logoImage = institutionRecord.logoImage;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.980+02:00", comments="Source Table: institution")
     public static final class InstitutionRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.756+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.981+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-04-10T15:17:04.756+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.982+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-04-10T15:17:04.756+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.982+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<InstitutionRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.756+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.982+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-04-10T15:17:04.756+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.982+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<InstitutionRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.982+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-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.982+02:00", comments="Source Table: institution")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(institutionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.982+02:00", comments="Source Table: institution")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.982+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-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.982+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-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.983+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-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.983+02:00", comments="Source Table: institution")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage)
                 .from(institutionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.983+02:00", comments="Source Table: institution")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage)
                 .from(institutionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.983+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-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.983+02:00", comments="Source Table: institution")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.983+02:00", comments="Source Table: institution")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.983+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-04-10T15:17:04.757+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.983+02:00", comments="Source Table: institution")
     default int updateByPrimaryKeySelective(InstitutionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, institutionRecord)
                 .set(name).equalToWhenPresent(record::getName)

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-04-10T15:17:04.767+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.996+02:00", comments="Source Table: lms_setup")
     public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.768+02:00", comments="Source field: lms_setup.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.996+02:00", comments="Source field: lms_setup.id")
     public static final SqlColumn<Long> id = lmsSetupRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.768+02:00", comments="Source field: lms_setup.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.996+02:00", comments="Source field: lms_setup.institution_id")
     public static final SqlColumn<Long> institutionId = lmsSetupRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.768+02:00", comments="Source field: lms_setup.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.996+02:00", comments="Source field: lms_setup.name")
     public static final SqlColumn<String> name = lmsSetupRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.768+02:00", comments="Source field: lms_setup.lms_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.996+02:00", comments="Source field: lms_setup.lms_type")
     public static final SqlColumn<String> lmsType = lmsSetupRecord.lmsType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.768+02:00", comments="Source field: lms_setup.lms_url")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.996+02:00", comments="Source field: lms_setup.lms_url")
     public static final SqlColumn<String> lmsUrl = lmsSetupRecord.lmsUrl;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.768+02:00", comments="Source field: lms_setup.lms_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.996+02:00", comments="Source field: lms_setup.lms_clientname")
     public static final SqlColumn<String> lmsClientname = lmsSetupRecord.lmsClientname;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.768+02:00", comments="Source field: lms_setup.lms_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+02:00", comments="Source field: lms_setup.lms_clientsecret")
     public static final SqlColumn<String> lmsClientsecret = lmsSetupRecord.lmsClientsecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.768+02:00", comments="Source field: lms_setup.lms_rest_api_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+02:00", comments="Source field: lms_setup.lms_rest_api_token")
     public static final SqlColumn<String> lmsRestApiToken = lmsSetupRecord.lmsRestApiToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.768+02:00", comments="Source field: lms_setup.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+02:00", comments="Source field: lms_setup.active")
     public static final SqlColumn<Integer> active = lmsSetupRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.996+02:00", comments="Source Table: lms_setup")
     public static final class LmsSetupRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.768+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+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<LmsSetupRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+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<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+02:00", comments="Source Table: lms_setup")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(lmsSetupRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+02:00", comments="Source Table: lms_setup")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.997+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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.998+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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.998+02:00", comments="Source Table: lms_setup")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> 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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.998+02:00", comments="Source Table: lms_setup")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> 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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.998+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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.998+02:00", comments="Source Table: lms_setup")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.998+02:00", comments="Source Table: lms_setup")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.998+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-04-10T15:17:04.769+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.998+02:00", comments="Source Table: lms_setup")
     default int updateByPrimaryKeySelective(LmsSetupRecord record) {
         return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class OrientationRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.681+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.932+02:00", comments="Source Table: orientation")
     public static final OrientationRecord orientationRecord = new OrientationRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.682+02:00", comments="Source field: orientation.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.932+02:00", comments="Source field: orientation.id")
     public static final SqlColumn<Long> id = orientationRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.682+02:00", comments="Source field: orientation.config_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.932+02:00", comments="Source field: orientation.config_attribute_id")
     public static final SqlColumn<Long> configAttributeId = orientationRecord.configAttributeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.682+02:00", comments="Source field: orientation.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.932+02:00", comments="Source field: orientation.template")
     public static final SqlColumn<String> template = orientationRecord.template;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.683+02:00", comments="Source field: orientation.view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.932+02:00", comments="Source field: orientation.view")
     public static final SqlColumn<String> view = orientationRecord.view;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.683+02:00", comments="Source field: orientation.group")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.933+02:00", comments="Source field: orientation.group")
     public static final SqlColumn<String> group = orientationRecord.group;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.683+02:00", comments="Source field: orientation.x_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.933+02:00", comments="Source field: orientation.x_position")
     public static final SqlColumn<Integer> xPosition = orientationRecord.xPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.683+02:00", comments="Source field: orientation.y_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.933+02:00", comments="Source field: orientation.y_position")
     public static final SqlColumn<Integer> yPosition = orientationRecord.yPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.683+02:00", comments="Source field: orientation.width")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.933+02:00", comments="Source field: orientation.width")
     public static final SqlColumn<Integer> width = orientationRecord.width;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.684+02:00", comments="Source field: orientation.height")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.933+02:00", comments="Source field: orientation.height")
     public static final SqlColumn<Integer> height = orientationRecord.height;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.682+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.932+02:00", comments="Source Table: orientation")
     public static final class OrientationRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.684+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.933+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-04-10T15:17:04.684+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.933+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-04-10T15:17:04.684+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.933+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<OrientationRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.684+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.933+02:00", comments="Source Table: orientation")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -60,7 +60,7 @@ public interface OrientationRecordMapper {
     })
     OrientationRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.684+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -75,22 +75,22 @@ public interface OrientationRecordMapper {
     })
     List<OrientationRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.685+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+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-04-10T15:17:04.685+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(orientationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.685+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.685+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord)
                 .where(id, isEqualTo(id_))
@@ -98,7 +98,7 @@ public interface OrientationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.685+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     default int insert(OrientationRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(orientationRecord)
@@ -114,7 +114,7 @@ public interface OrientationRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.685+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     default int insertSelective(OrientationRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(orientationRecord)
@@ -130,19 +130,19 @@ public interface OrientationRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.685+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
                 .from(orientationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.685+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
                 .from(orientationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.686+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     default OrientationRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
                 .from(orientationRecord)
@@ -151,7 +151,7 @@ public interface OrientationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.686+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalTo(record::getConfigAttributeId)
@@ -164,7 +164,7 @@ public interface OrientationRecordMapper {
                 .set(height).equalTo(record::getHeight);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.686+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.934+02:00", comments="Source Table: orientation")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)
@@ -177,7 +177,7 @@ public interface OrientationRecordMapper {
                 .set(height).equalToWhenPresent(record::getHeight);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.686+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.935+02:00", comments="Source Table: orientation")
     default int updateByPrimaryKey(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalTo(record::getConfigAttributeId)
@@ -193,7 +193,7 @@ public interface OrientationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.686+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.935+02:00", comments="Source Table: orientation")
     default int updateByPrimaryKeySelective(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)

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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+02:00", comments="Source Table: user_role")
     public static final RoleRecord roleRecord = new RoleRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.774+02:00", comments="Source field: user_role.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+02:00", comments="Source field: user_role.id")
     public static final SqlColumn<Long> id = roleRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.774+02:00", comments="Source field: user_role.user_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+02:00", comments="Source field: user_role.user_id")
     public static final SqlColumn<Long> userId = roleRecord.userId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.774+02:00", comments="Source field: user_role.role_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+02:00", comments="Source field: user_role.role_name")
     public static final SqlColumn<String> roleName = roleRecord.roleName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+02:00", comments="Source Table: user_role")
     public static final class RoleRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+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<RoleRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+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<RoleRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+02:00", comments="Source Table: user_role")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(roleRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+02:00", comments="Source Table: user_role")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+02:00", comments="Source Table: user_role")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<RoleRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, userId, roleName)
                 .from(roleRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+02:00", comments="Source Table: user_role")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<RoleRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userId, roleName)
                 .from(roleRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+02:00", comments="Source Table: user_role")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.007+02:00", comments="Source Table: user_role")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.008+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-04-10T15:17:04.774+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.008+02:00", comments="Source Table: user_role")
     default int updateByPrimaryKeySelective(RoleRecord record) {
         return UpdateDSL.updateWithMapper(this::update, roleRecord)
                 .set(userId).equalToWhenPresent(record::getUserId)

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

@@ -7,31 +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-04-10T15:17:04.762+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.988+02:00", comments="Source Table: seb_client_configuration")
     public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.762+02:00", comments="Source field: seb_client_configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.988+02:00", comments="Source field: seb_client_configuration.id")
     public static final SqlColumn<Long> id = sebClientConfigRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.762+02:00", comments="Source field: seb_client_configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.988+02:00", comments="Source field: seb_client_configuration.institution_id")
     public static final SqlColumn<Long> institutionId = sebClientConfigRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.762+02:00", comments="Source field: seb_client_configuration.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.988+02:00", comments="Source field: seb_client_configuration.name")
     public static final SqlColumn<String> name = sebClientConfigRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.762+02:00", comments="Source field: seb_client_configuration.date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.989+02:00", comments="Source field: seb_client_configuration.date")
     public static final SqlColumn<DateTime> date = sebClientConfigRecord.date;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.762+02:00", comments="Source field: seb_client_configuration.client_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.989+02:00", comments="Source field: seb_client_configuration.client_name")
     public static final SqlColumn<String> clientName = sebClientConfigRecord.clientName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.762+02:00", comments="Source field: seb_client_configuration.client_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.989+02:00", comments="Source field: seb_client_configuration.client_secret")
     public static final SqlColumn<String> clientSecret = sebClientConfigRecord.clientSecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.763+02:00", comments="Source field: seb_client_configuration.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.989+02:00", comments="Source field: seb_client_configuration.encrypt_secret")
+    public static final SqlColumn<String> encryptSecret = sebClientConfigRecord.encryptSecret;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.989+02:00", comments="Source field: seb_client_configuration.active")
     public static final SqlColumn<Integer> active = sebClientConfigRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.762+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.988+02:00", comments="Source Table: seb_client_configuration")
     public static final class SebClientConfigRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
@@ -45,6 +48,8 @@ public final class SebClientConfigRecordDynamicSqlSupport {
 
         public final SqlColumn<String> clientSecret = column("client_secret", JDBCType.VARCHAR);
 
+        public final SqlColumn<String> encryptSecret = column("encrypt_secret", JDBCType.VARCHAR);
+
         public final SqlColumn<Integer> active = column("active", JDBCType.INTEGER);
 
         public SebClientConfigRecord() {

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-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.989+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-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.989+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-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.989+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<SebClientConfigRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.989+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),
@@ -56,11 +56,12 @@ public interface SebClientConfigRecordMapper {
         @Arg(column="date", javaType=DateTime.class, typeHandler=JodaTimeTypeResolver.class, jdbcType=JdbcType.TIMESTAMP),
         @Arg(column="client_name", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="client_secret", javaType=String.class, jdbcType=JdbcType.VARCHAR),
+        @Arg(column="encrypt_secret", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER)
     })
     SebClientConfigRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.990+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),
@@ -69,26 +70,27 @@ public interface SebClientConfigRecordMapper {
         @Arg(column="date", javaType=DateTime.class, typeHandler=JodaTimeTypeResolver.class, jdbcType=JdbcType.TIMESTAMP),
         @Arg(column="client_name", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="client_secret", javaType=String.class, jdbcType=JdbcType.VARCHAR),
+        @Arg(column="encrypt_secret", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER)
     })
     List<SebClientConfigRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.991+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-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.991+02:00", comments="Source Table: seb_client_configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(sebClientConfigRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.991+02:00", comments="Source Table: seb_client_configuration")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.992+02:00", comments="Source Table: seb_client_configuration")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord)
                 .where(id, isEqualTo(id_))
@@ -96,7 +98,7 @@ public interface SebClientConfigRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.992+02:00", comments="Source Table: seb_client_configuration")
     default int insert(SebClientConfigRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(sebClientConfigRecord)
@@ -105,12 +107,13 @@ public interface SebClientConfigRecordMapper {
                 .map(date).toProperty("date")
                 .map(clientName).toProperty("clientName")
                 .map(clientSecret).toProperty("clientSecret")
+                .map(encryptSecret).toProperty("encryptSecret")
                 .map(active).toProperty("active")
                 .build()
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.992+02:00", comments="Source Table: seb_client_configuration")
     default int insertSelective(SebClientConfigRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(sebClientConfigRecord)
@@ -119,33 +122,34 @@ public interface SebClientConfigRecordMapper {
                 .map(date).toPropertyWhenPresent("date", record::getDate)
                 .map(clientName).toPropertyWhenPresent("clientName", record::getClientName)
                 .map(clientSecret).toPropertyWhenPresent("clientSecret", record::getClientSecret)
+                .map(encryptSecret).toPropertyWhenPresent("encryptSecret", record::getEncryptSecret)
                 .map(active).toPropertyWhenPresent("active", record::getActive)
                 .build()
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.992+02:00", comments="Source Table: seb_client_configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SebClientConfigRecord>>> selectByExample() {
-        return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, active)
+        return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active)
                 .from(sebClientConfigRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.763+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.992+02:00", comments="Source Table: seb_client_configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SebClientConfigRecord>>> selectDistinctByExample() {
-        return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, active)
+        return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active)
                 .from(sebClientConfigRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.764+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.992+02:00", comments="Source Table: seb_client_configuration")
     default SebClientConfigRecord selectByPrimaryKey(Long id_) {
-        return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, active)
+        return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active)
                 .from(sebClientConfigRecord)
                 .where(id, isEqualTo(id_))
                 .build()
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.764+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.992+02:00", comments="Source Table: seb_client_configuration")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(SebClientConfigRecord record) {
         return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -153,10 +157,11 @@ public interface SebClientConfigRecordMapper {
                 .set(date).equalTo(record::getDate)
                 .set(clientName).equalTo(record::getClientName)
                 .set(clientSecret).equalTo(record::getClientSecret)
+                .set(encryptSecret).equalTo(record::getEncryptSecret)
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.764+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.992+02:00", comments="Source Table: seb_client_configuration")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(SebClientConfigRecord record) {
         return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -164,10 +169,11 @@ public interface SebClientConfigRecordMapper {
                 .set(date).equalToWhenPresent(record::getDate)
                 .set(clientName).equalToWhenPresent(record::getClientName)
                 .set(clientSecret).equalToWhenPresent(record::getClientSecret)
+                .set(encryptSecret).equalToWhenPresent(record::getEncryptSecret)
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.764+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.992+02:00", comments="Source Table: seb_client_configuration")
     default int updateByPrimaryKey(SebClientConfigRecord record) {
         return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -175,13 +181,14 @@ public interface SebClientConfigRecordMapper {
                 .set(date).equalTo(record::getDate)
                 .set(clientName).equalTo(record::getClientName)
                 .set(clientSecret).equalTo(record::getClientSecret)
+                .set(encryptSecret).equalTo(record::getEncryptSecret)
                 .set(active).equalTo(record::getActive)
                 .where(id, isEqualTo(record::getId))
                 .build()
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.764+02:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.992+02:00", comments="Source Table: seb_client_configuration")
     default int updateByPrimaryKeySelective(SebClientConfigRecord record) {
         return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -189,6 +196,7 @@ public interface SebClientConfigRecordMapper {
                 .set(date).equalToWhenPresent(record::getDate)
                 .set(clientName).equalToWhenPresent(record::getClientName)
                 .set(clientSecret).equalToWhenPresent(record::getClientSecret)
+                .set(encryptSecret).equalToWhenPresent(record::getEncryptSecret)
                 .set(active).equalToWhenPresent(record::getActive)
                 .where(id, isEqualTo(record::getId))
                 .build()

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-04-10T15:17:04.751+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source Table: threshold")
     public static final ThresholdRecord thresholdRecord = new ThresholdRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.751+02:00", comments="Source field: threshold.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source field: threshold.id")
     public static final SqlColumn<Long> id = thresholdRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.751+02:00", comments="Source field: threshold.indicator_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source field: threshold.indicator_id")
     public static final SqlColumn<Long> indicatorId = thresholdRecord.indicatorId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.751+02:00", comments="Source field: threshold.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+02:00", comments="Source field: threshold.value")
     public static final SqlColumn<BigDecimal> value = thresholdRecord.value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.751+02:00", comments="Source field: threshold.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+02:00", comments="Source field: threshold.color")
     public static final SqlColumn<String> color = thresholdRecord.color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.751+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source Table: threshold")
     public static final class ThresholdRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.751+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+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-04-10T15:17:04.751+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+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-04-10T15:17:04.751+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+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<ThresholdRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.751+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+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-04-10T15:17:04.751+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+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<ThresholdRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.751+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+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-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+02:00", comments="Source Table: threshold")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(thresholdRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+02:00", comments="Source Table: threshold")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+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-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+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-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+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-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+02:00", comments="Source Table: threshold")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ThresholdRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, indicatorId, value, color)
                 .from(thresholdRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+02:00", comments="Source Table: threshold")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ThresholdRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, indicatorId, value, color)
                 .from(thresholdRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+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-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+02:00", comments="Source Table: threshold")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.978+02:00", comments="Source Table: threshold")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.979+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-04-10T15:17:04.752+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.979+02:00", comments="Source Table: threshold")
     default int updateByPrimaryKeySelective(ThresholdRecord record) {
         return UpdateDSL.updateWithMapper(this::update, thresholdRecord)
                 .set(indicatorId).equalToWhenPresent(record::getIndicatorId)

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-04-10T15:17:04.776+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source Table: user_activity_log")
     public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.id")
     public static final SqlColumn<Long> id = userActivityLogRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.777+02:00", comments="Source field: user_activity_log.user_uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.user_uuid")
     public static final SqlColumn<String> userUuid = userActivityLogRecord.userUuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.777+02:00", comments="Source field: user_activity_log.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.timestamp")
     public static final SqlColumn<Long> timestamp = userActivityLogRecord.timestamp;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.777+02:00", comments="Source field: user_activity_log.activity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+02:00", comments="Source field: user_activity_log.activity_type")
     public static final SqlColumn<String> activityType = userActivityLogRecord.activityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.777+02:00", comments="Source field: user_activity_log.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+02:00", comments="Source field: user_activity_log.entity_type")
     public static final SqlColumn<String> entityType = userActivityLogRecord.entityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.777+02:00", comments="Source field: user_activity_log.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+02:00", comments="Source field: user_activity_log.entity_id")
     public static final SqlColumn<String> entityId = userActivityLogRecord.entityId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.777+02:00", comments="Source field: user_activity_log.message")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+02:00", comments="Source field: user_activity_log.message")
     public static final SqlColumn<String> message = userActivityLogRecord.message;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source Table: user_activity_log")
     public static final class UserActivityLogRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.777+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+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<UserActivityLogRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+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<UserActivityLogRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+02:00", comments="Source Table: user_activity_log")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(userActivityLogRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+02:00", comments="Source Table: user_activity_log")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.011+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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.012+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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.012+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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.012+02:00", comments="Source Table: user_activity_log")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserActivityLogRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message)
                 .from(userActivityLogRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.012+02:00", comments="Source Table: user_activity_log")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserActivityLogRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message)
                 .from(userActivityLogRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.012+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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.012+02:00", comments="Source Table: user_activity_log")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.012+02:00", comments="Source Table: user_activity_log")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.012+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-04-10T15:17:04.778+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.012+02:00", comments="Source Table: user_activity_log")
     default int updateByPrimaryKeySelective(UserActivityLogRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord)
                 .set(userUuid).equalToWhenPresent(record::getUserUuid)

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-04-10T15:17:04.771+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source Table: user")
     public static final UserRecord userRecord = new UserRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.002+02:00", comments="Source field: user.id")
     public static final SqlColumn<Long> id = userRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.002+02:00", comments="Source field: user.institution_id")
     public static final SqlColumn<Long> institutionId = userRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.002+02:00", comments="Source field: user.uuid")
     public static final SqlColumn<String> uuid = userRecord.uuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.002+02:00", comments="Source field: user.name")
     public static final SqlColumn<String> name = userRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.002+02:00", comments="Source field: user.username")
     public static final SqlColumn<String> username = userRecord.username;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.002+02:00", comments="Source field: user.password")
     public static final SqlColumn<String> password = userRecord.password;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.email")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.002+02:00", comments="Source field: user.email")
     public static final SqlColumn<String> email = userRecord.email;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.language")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.002+02:00", comments="Source field: user.language")
     public static final SqlColumn<String> language = userRecord.language;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.timezone")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.002+02:00", comments="Source field: user.timezone")
     public static final SqlColumn<String> timezone = userRecord.timezone;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.003+02:00", comments="Source field: user.active")
     public static final SqlColumn<Integer> active = userRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.002+02:00", comments="Source Table: user")
     public static final class UserRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 

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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.003+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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.003+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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.003+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<UserRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.003+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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.003+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<UserRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.003+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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.003+02:00", comments="Source Table: user")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(userRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.003+02:00", comments="Source Table: user")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, userRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.004+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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.004+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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.004+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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.004+02:00", comments="Source Table: user")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> 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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.004+02:00", comments="Source Table: user")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> 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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.004+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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.004+02:00", comments="Source Table: user")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.004+02:00", comments="Source Table: user")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> 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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.004+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-04-10T15:17:04.772+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.004+02:00", comments="Source Table: user")
     default int updateByPrimaryKeySelective(UserRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.entity_type")
     private String entityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.entity_id")
     private Long entityId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.value")
     private String value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+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-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.entity_type")
     public String getEntityType() {
         return entityType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.entity_id")
     public Long getEntityId() {
         return entityId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+02:00", comments="Source field: additional_attributes.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.779+02:00", comments="Source field: additional_attributes.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.014+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.717+02:00", comments="Source field: client_connection.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.958+02:00", comments="Source field: client_connection.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.717+02:00", comments="Source field: client_connection.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.exam_id")
     private Long examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.717+02:00", comments="Source field: client_connection.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.status")
     private String status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.717+02:00", comments="Source field: client_connection.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.connection_token")
     private String connectionToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.718+02:00", comments="Source field: client_connection.user_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.user_name")
     private String userName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.718+02:00", comments="Source field: client_connection.vdi")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.vdi")
     private Boolean vdi;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.718+02:00", comments="Source field: client_connection.client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.client_address")
     private String clientAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.718+02:00", comments="Source field: client_connection.virtual_client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.960+02:00", comments="Source field: client_connection.virtual_client_address")
     private String virtualClientAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.717+02:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.958+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-04-10T15:17:04.717+02:00", comments="Source field: client_connection.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.958+02:00", comments="Source field: client_connection.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.717+02:00", comments="Source field: client_connection.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.exam_id")
     public Long getExamId() {
         return examId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.717+02:00", comments="Source field: client_connection.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.status")
     public String getStatus() {
         return status;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.717+02:00", comments="Source field: client_connection.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.connection_token")
     public String getConnectionToken() {
         return connectionToken;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.718+02:00", comments="Source field: client_connection.user_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.user_name")
     public String getUserName() {
         return userName;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.718+02:00", comments="Source field: client_connection.vdi")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.vdi")
     public Boolean getVdi() {
         return vdi;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.718+02:00", comments="Source field: client_connection.client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.959+02:00", comments="Source field: client_connection.client_address")
     public String getClientAddress() {
         return clientAddress;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.718+02:00", comments="Source field: client_connection.virtual_client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.960+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.724+02:00", comments="Source field: client_event.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.964+02:00", comments="Source field: client_event.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.724+02:00", comments="Source field: client_event.connection_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.964+02:00", comments="Source field: client_event.connection_id")
     private Long connectionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.724+02:00", comments="Source field: client_event.user_identifier")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.964+02:00", comments="Source field: client_event.user_identifier")
     private String userIdentifier;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.724+02:00", comments="Source field: client_event.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+02:00", comments="Source field: client_event.type")
     private Integer type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.724+02:00", comments="Source field: client_event.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+02:00", comments="Source field: client_event.timestamp")
     private Long timestamp;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.725+02:00", comments="Source field: client_event.numeric_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+02:00", comments="Source field: client_event.numeric_value")
     private BigDecimal numericValue;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.725+02:00", comments="Source field: client_event.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+02:00", comments="Source field: client_event.text")
     private String text;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.723+02:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.964+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-04-10T15:17:04.724+02:00", comments="Source field: client_event.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.964+02:00", comments="Source field: client_event.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.724+02:00", comments="Source field: client_event.connection_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.964+02:00", comments="Source field: client_event.connection_id")
     public Long getConnectionId() {
         return connectionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.724+02:00", comments="Source field: client_event.user_identifier")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+02:00", comments="Source field: client_event.user_identifier")
     public String getUserIdentifier() {
         return userIdentifier;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.724+02:00", comments="Source field: client_event.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+02:00", comments="Source field: client_event.type")
     public Integer getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.724+02:00", comments="Source field: client_event.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+02:00", comments="Source field: client_event.timestamp")
     public Long getTimestamp() {
         return timestamp;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.725+02:00", comments="Source field: client_event.numeric_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+02:00", comments="Source field: client_event.numeric_value")
     public BigDecimal getNumericValue() {
         return numericValue;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.725+02:00", comments="Source field: client_event.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.965+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.423+02:00", comments="Source field: configuration_attribute.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.742+02:00", comments="Source field: configuration_attribute.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.424+02:00", comments="Source field: configuration_attribute.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.743+02:00", comments="Source field: configuration_attribute.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.424+02:00", comments="Source field: configuration_attribute.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.743+02:00", comments="Source field: configuration_attribute.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.425+02:00", comments="Source field: configuration_attribute.parent_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.743+02:00", comments="Source field: configuration_attribute.parent_id")
     private Long parentId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.425+02:00", comments="Source field: configuration_attribute.resources")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.743+02:00", comments="Source field: configuration_attribute.resources")
     private String resources;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.425+02:00", comments="Source field: configuration_attribute.validator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.743+02:00", comments="Source field: configuration_attribute.validator")
     private String validator;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.425+02:00", comments="Source field: configuration_attribute.dependencies")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.744+02:00", comments="Source field: configuration_attribute.dependencies")
     private String dependencies;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.425+02:00", comments="Source field: configuration_attribute.default_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.744+02:00", comments="Source field: configuration_attribute.default_value")
     private String defaultValue;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.416+02:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.732+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-04-10T15:17:04.424+02:00", comments="Source field: configuration_attribute.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.742+02:00", comments="Source field: configuration_attribute.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.424+02:00", comments="Source field: configuration_attribute.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.743+02:00", comments="Source field: configuration_attribute.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.424+02:00", comments="Source field: configuration_attribute.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.743+02:00", comments="Source field: configuration_attribute.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.425+02:00", comments="Source field: configuration_attribute.parent_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.743+02:00", comments="Source field: configuration_attribute.parent_id")
     public Long getParentId() {
         return parentId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.425+02:00", comments="Source field: configuration_attribute.resources")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.743+02:00", comments="Source field: configuration_attribute.resources")
     public String getResources() {
         return resources;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.425+02:00", comments="Source field: configuration_attribute.validator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.744+02:00", comments="Source field: configuration_attribute.validator")
     public String getValidator() {
         return validator;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.425+02:00", comments="Source field: configuration_attribute.dependencies")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.744+02:00", comments="Source field: configuration_attribute.dependencies")
     public String getDependencies() {
         return dependencies;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.425+02:00", comments="Source field: configuration_attribute.default_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.744+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.699+02:00", comments="Source field: configuration_node.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.939+02:00", comments="Source field: configuration_node.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.699+02:00", comments="Source field: configuration_node.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.939+02:00", comments="Source field: configuration_node.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.699+02:00", comments="Source field: configuration_node.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.owner")
     private String owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.699+02:00", comments="Source field: configuration_node.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.700+02:00", comments="Source field: configuration_node.description")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.description")
     private String description;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.700+02:00", comments="Source field: configuration_node.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.700+02:00", comments="Source field: configuration_node.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.template")
     private String template;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.700+02:00", comments="Source field: configuration_node.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.941+02:00", comments="Source field: configuration_node.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.699+02:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.939+02:00", comments="Source Table: configuration_node")
     public ConfigurationNodeRecord(Long id, Long institutionId, String owner, String name, String description, String type, String template, Integer active) {
         this.id = id;
         this.institutionId = institutionId;
@@ -39,42 +39,42 @@ public class ConfigurationNodeRecord {
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.699+02:00", comments="Source field: configuration_node.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.939+02:00", comments="Source field: configuration_node.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.699+02:00", comments="Source field: configuration_node.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.699+02:00", comments="Source field: configuration_node.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.owner")
     public String getOwner() {
         return owner;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.699+02:00", comments="Source field: configuration_node.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.700+02:00", comments="Source field: configuration_node.description")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.description")
     public String getDescription() {
         return description;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.700+02:00", comments="Source field: configuration_node.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.700+02:00", comments="Source field: configuration_node.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.940+02:00", comments="Source field: configuration_node.template")
     public String getTemplate() {
         return template;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.700+02:00", comments="Source field: configuration_node.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.941+02:00", comments="Source field: configuration_node.active")
     public Integer getActive() {
         return active;
     }
@@ -83,7 +83,7 @@ public class ConfigurationNodeRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_node
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.689+02:00", comments="Source field: configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.935+02:00", comments="Source field: configuration.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.689+02:00", comments="Source field: configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.935+02:00", comments="Source field: configuration.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.689+02:00", comments="Source field: configuration.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.936+02:00", comments="Source field: configuration.configuration_node_id")
     private Long configurationNodeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.689+02:00", comments="Source field: configuration.version")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.936+02:00", comments="Source field: configuration.version")
     private String version;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.689+02:00", comments="Source field: configuration.version_date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.936+02:00", comments="Source field: configuration.version_date")
     private DateTime versionDate;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.689+02:00", comments="Source field: configuration.followup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.936+02:00", comments="Source field: configuration.followup")
     private Integer followup;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.688+02:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.935+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-04-10T15:17:04.689+02:00", comments="Source field: configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.935+02:00", comments="Source field: configuration.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.689+02:00", comments="Source field: configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.935+02:00", comments="Source field: configuration.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.689+02:00", comments="Source field: configuration.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.936+02:00", comments="Source field: configuration.configuration_node_id")
     public Long getConfigurationNodeId() {
         return configurationNodeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.689+02:00", comments="Source field: configuration.version")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.936+02:00", comments="Source field: configuration.version")
     public String getVersion() {
         return version;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.689+02:00", comments="Source field: configuration.version_date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.936+02:00", comments="Source field: configuration.version_date")
     public DateTime getVersionDate() {
         return versionDate;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.689+02:00", comments="Source field: configuration.followup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.936+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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

@@ -3,28 +3,28 @@ 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-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.926+02:00", comments="Source field: configuration_value.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.configuration_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.configuration_id")
     private Long configurationId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.configuration_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.configuration_attribute_id")
     private Long configurationAttributeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.list_index")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.list_index")
     private Integer listIndex;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.value")
     private String value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.675+02:00", comments="Source field: configuration_value.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.text")
     private String text;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.926+02:00", comments="Source Table: configuration_value")
     public ConfigurationValueRecord(Long id, Long institutionId, Long configurationId, Long configurationAttributeId, Integer listIndex, String value, String text) {
         this.id = id;
         this.institutionId = institutionId;
@@ -35,37 +35,37 @@ public class ConfigurationValueRecord {
         this.text = text;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.926+02:00", comments="Source field: configuration_value.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.configuration_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.configuration_id")
     public Long getConfigurationId() {
         return configurationId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.configuration_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.configuration_attribute_id")
     public Long getConfigurationAttributeId() {
         return configurationAttributeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.674+02:00", comments="Source field: configuration_value.list_index")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.list_index")
     public Integer getListIndex() {
         return listIndex;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.675+02:00", comments="Source field: configuration_value.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.value")
     public String getValue() {
         return value;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.675+02:00", comments="Source field: configuration_value.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.927+02:00", comments="Source field: configuration_value.text")
     public String getText() {
         return text;
     }
@@ -74,7 +74,7 @@ public class ConfigurationValueRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_value
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public String toString() {
@@ -97,7 +97,7 @@ public class ConfigurationValueRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_value
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -124,7 +124,7 @@ public class ConfigurationValueRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_value
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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

@@ -3,22 +3,22 @@ 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-04-10T15:17:04.705+02:00", comments="Source field: exam_configuration_map.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+02:00", comments="Source field: exam_configuration_map.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.705+02:00", comments="Source field: exam_configuration_map.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+02:00", comments="Source field: exam_configuration_map.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.705+02:00", comments="Source field: exam_configuration_map.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+02:00", comments="Source field: exam_configuration_map.exam_id")
     private Long examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.705+02:00", comments="Source field: exam_configuration_map.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+02:00", comments="Source field: exam_configuration_map.configuration_node_id")
     private Long configurationNodeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.706+02:00", comments="Source field: exam_configuration_map.user_names")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+02:00", comments="Source field: exam_configuration_map.user_names")
     private String userNames;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.705+02:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+02:00", comments="Source Table: exam_configuration_map")
     public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String userNames) {
         this.id = id;
         this.institutionId = institutionId;
@@ -27,27 +27,27 @@ public class ExamConfigurationMapRecord {
         this.userNames = userNames;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.705+02:00", comments="Source field: exam_configuration_map.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+02:00", comments="Source field: exam_configuration_map.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.705+02:00", comments="Source field: exam_configuration_map.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+02:00", comments="Source field: exam_configuration_map.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.705+02:00", comments="Source field: exam_configuration_map.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+02:00", comments="Source field: exam_configuration_map.exam_id")
     public Long getExamId() {
         return examId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.706+02:00", comments="Source field: exam_configuration_map.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+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-04-10T15:17:04.706+02:00", comments="Source field: exam_configuration_map.user_names")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.944+02:00", comments="Source field: exam_configuration_map.user_names")
     public String getUserNames() {
         return userNames;
     }
@@ -56,7 +56,7 @@ public class ExamConfigurationMapRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam_configuration_map
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public String toString() {
@@ -77,7 +77,7 @@ public class ExamConfigurationMapRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam_configuration_map
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -102,7 +102,7 @@ public class ExamConfigurationMapRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam_configuration_map
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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

@@ -3,34 +3,34 @@ 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-04-10T15:17:04.711+02:00", comments="Source field: exam.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.lms_setup_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.lms_setup_id")
     private Long lmsSetupId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.external_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.external_id")
     private String externalId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.owner")
     private String owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.supporter")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.supporter")
     private String supporter;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.quit_password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.952+02:00", comments="Source field: exam.quit_password")
     private String quitPassword;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.712+02:00", comments="Source field: exam.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.952+02:00", comments="Source field: exam.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.710+02:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.950+02:00", comments="Source Table: exam")
     public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String quitPassword, Integer active) {
         this.id = id;
         this.institutionId = institutionId;
@@ -43,47 +43,47 @@ public class ExamRecord {
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.lms_setup_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.lms_setup_id")
     public Long getLmsSetupId() {
         return lmsSetupId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.external_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.external_id")
     public String getExternalId() {
         return externalId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.owner")
     public String getOwner() {
         return owner;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.supporter")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.951+02:00", comments="Source field: exam.supporter")
     public String getSupporter() {
         return supporter;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.711+02:00", comments="Source field: exam.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.952+02:00", comments="Source field: exam.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.712+02:00", comments="Source field: exam.quit_password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.952+02:00", comments="Source field: exam.quit_password")
     public String getQuitPassword() {
         return quitPassword;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.712+02:00", comments="Source field: exam.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.952+02:00", comments="Source field: exam.active")
     public Integer getActive() {
         return active;
     }
@@ -92,7 +92,7 @@ public class ExamRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public String toString() {
@@ -117,7 +117,7 @@ public class ExamRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -146,7 +146,7 @@ public class ExamRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.734+02:00", comments="Source field: indicator.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.970+02:00", comments="Source field: indicator.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.736+02:00", comments="Source field: indicator.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.971+02:00", comments="Source field: indicator.exam_id")
     private Long examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.736+02:00", comments="Source field: indicator.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.971+02:00", comments="Source field: indicator.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.739+02:00", comments="Source field: indicator.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.971+02:00", comments="Source field: indicator.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.740+02:00", comments="Source field: indicator.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.971+02:00", comments="Source field: indicator.color")
     private String color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.734+02:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.970+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-04-10T15:17:04.736+02:00", comments="Source field: indicator.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.971+02:00", comments="Source field: indicator.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.736+02:00", comments="Source field: indicator.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.971+02:00", comments="Source field: indicator.exam_id")
     public Long getExamId() {
         return examId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.739+02:00", comments="Source field: indicator.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.971+02:00", comments="Source field: indicator.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.740+02:00", comments="Source field: indicator.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.971+02:00", comments="Source field: indicator.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.740+02:00", comments="Source field: indicator.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.971+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.755+02:00", comments="Source field: institution.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.979+02:00", comments="Source field: institution.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.979+02:00", comments="Source field: institution.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.url_suffix")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.980+02:00", comments="Source field: institution.url_suffix")
     private String urlSuffix;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.theme_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.980+02:00", comments="Source field: institution.theme_name")
     private String themeName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.980+02:00", comments="Source field: institution.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.logo_image")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.980+02:00", comments="Source field: institution.logo_image")
     private String logoImage;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.754+02:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.979+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-04-10T15:17:04.755+02:00", comments="Source field: institution.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.979+02:00", comments="Source field: institution.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.979+02:00", comments="Source field: institution.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.url_suffix")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.980+02:00", comments="Source field: institution.url_suffix")
     public String getUrlSuffix() {
         return urlSuffix;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.theme_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.980+02:00", comments="Source field: institution.theme_name")
     public String getThemeName() {
         return themeName;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.980+02:00", comments="Source field: institution.active")
     public Integer getActive() {
         return active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.755+02:00", comments="Source field: institution.logo_image")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.980+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.766+02:00", comments="Source field: lms_setup.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.994+02:00", comments="Source field: lms_setup.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.766+02:00", comments="Source field: lms_setup.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.766+02:00", comments="Source field: lms_setup.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.lms_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.lms_type")
     private String lmsType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.lms_url")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.lms_url")
     private String lmsUrl;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.lms_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.lms_clientname")
     private String lmsClientname;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.lms_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.lms_clientsecret")
     private String lmsClientsecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.lms_rest_api_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.lms_rest_api_token")
     private String lmsRestApiToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.766+02:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.994+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-04-10T15:17:04.766+02:00", comments="Source field: lms_setup.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.766+02:00", comments="Source field: lms_setup.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.766+02:00", comments="Source field: lms_setup.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.lms_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.lms_type")
     public String getLmsType() {
         return lmsType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.lms_url")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.lms_url")
     public String getLmsUrl() {
         return lmsUrl;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.lms_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.lms_clientname")
     public String getLmsClientname() {
         return lmsClientname;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.lms_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+02:00", comments="Source field: lms_setup.lms_clientsecret")
     public String getLmsClientsecret() {
         return lmsClientsecret;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.lms_rest_api_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+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-04-10T15:17:04.767+02:00", comments="Source field: lms_setup.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.995+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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

@@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class OrientationRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.679+02:00", comments="Source field: orientation.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.930+02:00", comments="Source field: orientation.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.config_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.config_attribute_id")
     private Long configAttributeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.template")
     private String template;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.view")
     private String view;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.group")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.group")
     private String group;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.x_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.x_position")
     private Integer xPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.681+02:00", comments="Source field: orientation.y_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.y_position")
     private Integer yPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.681+02:00", comments="Source field: orientation.width")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.width")
     private Integer width;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.681+02:00", comments="Source field: orientation.height")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.932+02:00", comments="Source field: orientation.height")
     private Integer height;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.679+02:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.930+02:00", comments="Source Table: orientation")
     public OrientationRecord(Long id, Long configAttributeId, String template, String view, String group, Integer xPosition, Integer yPosition, Integer width, Integer height) {
         this.id = id;
         this.configAttributeId = configAttributeId;
@@ -43,47 +43,47 @@ public class OrientationRecord {
         this.height = height;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.930+02:00", comments="Source field: orientation.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.config_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.config_attribute_id")
     public Long getConfigAttributeId() {
         return configAttributeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.template")
     public String getTemplate() {
         return template;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.view")
     public String getView() {
         return view;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.group")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.group")
     public String getGroup() {
         return group;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.680+02:00", comments="Source field: orientation.x_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.x_position")
     public Integer getxPosition() {
         return xPosition;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.681+02:00", comments="Source field: orientation.y_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.y_position")
     public Integer getyPosition() {
         return yPosition;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.681+02:00", comments="Source field: orientation.width")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.931+02:00", comments="Source field: orientation.width")
     public Integer getWidth() {
         return width;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.681+02:00", comments="Source field: orientation.height")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.932+02:00", comments="Source field: orientation.height")
     public Integer getHeight() {
         return height;
     }
@@ -92,7 +92,7 @@ public class OrientationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table orientation
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public String toString() {
@@ -117,7 +117,7 @@ public class OrientationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table orientation
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -146,7 +146,7 @@ public class OrientationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table orientation
      *
-     * @mbg.generated Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.773+02:00", comments="Source field: user_role.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.005+02:00", comments="Source field: user_role.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.773+02:00", comments="Source field: user_role.user_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+02:00", comments="Source field: user_role.user_id")
     private Long userId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.773+02:00", comments="Source field: user_role.role_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+02:00", comments="Source field: user_role.role_name")
     private String roleName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.773+02:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.005+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-04-10T15:17:04.773+02:00", comments="Source field: user_role.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+02:00", comments="Source field: user_role.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.773+02:00", comments="Source field: user_role.user_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+02:00", comments="Source field: user_role.user_id")
     public Long getUserId() {
         return userId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.773+02:00", comments="Source field: user_role.role_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.006+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 CEST 2019
      */
     @Override
     public int hashCode() {

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

@@ -4,69 +4,78 @@ import javax.annotation.Generated;
 import org.joda.time.DateTime;
 
 public class SebClientConfigRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.760+02:00", comments="Source field: seb_client_configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.985+02:00", comments="Source field: seb_client_configuration.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.760+02:00", comments="Source field: seb_client_configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.986+02:00", comments="Source field: seb_client_configuration.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.761+02:00", comments="Source field: seb_client_configuration.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.761+02:00", comments="Source field: seb_client_configuration.date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.date")
     private DateTime date;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.761+02:00", comments="Source field: seb_client_configuration.client_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.client_name")
     private String clientName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.761+02:00", comments="Source field: seb_client_configuration.client_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.client_secret")
     private String clientSecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.761+02:00", comments="Source field: seb_client_configuration.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.encrypt_secret")
+    private String encryptSecret;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.988+02:00", comments="Source field: seb_client_configuration.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.760+02:00", comments="Source Table: seb_client_configuration")
-    public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, Integer active) {
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.985+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;
         this.name = name;
         this.date = date;
         this.clientName = clientName;
         this.clientSecret = clientSecret;
+        this.encryptSecret = encryptSecret;
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.760+02:00", comments="Source field: seb_client_configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.986+02:00", comments="Source field: seb_client_configuration.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.760+02:00", comments="Source field: seb_client_configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.761+02:00", comments="Source field: seb_client_configuration.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.761+02:00", comments="Source field: seb_client_configuration.date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.date")
     public DateTime getDate() {
         return date;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.761+02:00", comments="Source field: seb_client_configuration.client_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.client_name")
     public String getClientName() {
         return clientName;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.761+02:00", comments="Source field: seb_client_configuration.client_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.client_secret")
     public String getClientSecret() {
         return clientSecret;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.761+02:00", comments="Source field: seb_client_configuration.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.987+02:00", comments="Source field: seb_client_configuration.encrypt_secret")
+    public String getEncryptSecret() {
+        return encryptSecret;
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.988+02:00", comments="Source field: seb_client_configuration.active")
     public Integer getActive() {
         return active;
     }
@@ -75,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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public String toString() {
@@ -89,6 +98,7 @@ public class SebClientConfigRecord {
         sb.append(", date=").append(date);
         sb.append(", clientName=").append(clientName);
         sb.append(", clientSecret=").append(clientSecret);
+        sb.append(", encryptSecret=").append(encryptSecret);
         sb.append(", active=").append(active);
         sb.append("]");
         return sb.toString();
@@ -98,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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -118,6 +128,7 @@ public class SebClientConfigRecord {
             && (this.getDate() == null ? other.getDate() == null : this.getDate().equals(other.getDate()))
             && (this.getClientName() == null ? other.getClientName() == null : this.getClientName().equals(other.getClientName()))
             && (this.getClientSecret() == null ? other.getClientSecret() == null : this.getClientSecret().equals(other.getClientSecret()))
+            && (this.getEncryptSecret() == null ? other.getEncryptSecret() == null : this.getEncryptSecret().equals(other.getEncryptSecret()))
             && (this.getActive() == null ? other.getActive() == null : this.getActive().equals(other.getActive()));
     }
 
@@ -125,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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {
@@ -137,6 +148,7 @@ public class SebClientConfigRecord {
         result = prime * result + ((getDate() == null) ? 0 : getDate().hashCode());
         result = prime * result + ((getClientName() == null) ? 0 : getClientName().hashCode());
         result = prime * result + ((getClientSecret() == null) ? 0 : getClientSecret().hashCode());
+        result = prime * result + ((getEncryptSecret() == null) ? 0 : getEncryptSecret().hashCode());
         result = prime * result + ((getActive() == null) ? 0 : getActive().hashCode());
         return result;
     }

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-04-10T15:17:04.750+02:00", comments="Source field: threshold.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source field: threshold.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.750+02:00", comments="Source field: threshold.indicator_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source field: threshold.indicator_id")
     private Long indicatorId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.750+02:00", comments="Source field: threshold.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source field: threshold.value")
     private BigDecimal value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.750+02:00", comments="Source field: threshold.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source field: threshold.color")
     private String color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.750+02:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+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-04-10T15:17:04.750+02:00", comments="Source field: threshold.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source field: threshold.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.750+02:00", comments="Source field: threshold.indicator_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source field: threshold.indicator_id")
     public Long getIndicatorId() {
         return indicatorId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.750+02:00", comments="Source field: threshold.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+02:00", comments="Source field: threshold.value")
     public BigDecimal getValue() {
         return value;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.750+02:00", comments="Source field: threshold.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:18.977+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:18 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.009+02:00", comments="Source field: user_activity_log.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.user_uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.009+02:00", comments="Source field: user_activity_log.user_uuid")
     private String userUuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.009+02:00", comments="Source field: user_activity_log.timestamp")
     private Long timestamp;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.activity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.activity_type")
     private String activityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.entity_type")
     private String entityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.entity_id")
     private String entityId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.message")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.message")
     private String message;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.775+02:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.009+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-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.009+02:00", comments="Source field: user_activity_log.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.user_uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.009+02:00", comments="Source field: user_activity_log.user_uuid")
     public String getUserUuid() {
         return userUuid;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.timestamp")
     public Long getTimestamp() {
         return timestamp;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.activity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.activity_type")
     public String getActivityType() {
         return activityType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.entity_type")
     public String getEntityType() {
         return entityType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+02:00", comments="Source field: user_activity_log.entity_id")
     public String getEntityId() {
         return entityId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.776+02:00", comments="Source field: user_activity_log.message")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.010+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 CEST 2019
      */
     @Override
     public int hashCode() {

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-04-10T15:17:04.770+02:00", comments="Source field: user.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19+02:00", comments="Source field: user.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19+02:00", comments="Source field: user.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19+02:00", comments="Source field: user.uuid")
     private String uuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19+02:00", comments="Source field: user.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.username")
     private String username;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.password")
     private String password;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.email")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.email")
     private String email;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.language")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.language")
     private String language;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.timezone")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.timezone")
     private String timezone;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19+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-04-10T15:17:04.770+02:00", comments="Source field: user.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19+02:00", comments="Source field: user.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19+02:00", comments="Source field: user.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19+02:00", comments="Source field: user.uuid")
     public String getUuid() {
         return uuid;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.username")
     public String getUsername() {
         return username;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.password")
     public String getPassword() {
         return password;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.email")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.email")
     public String getEmail() {
         return email;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.language")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.language")
     public String getLanguage() {
         return language;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.770+02:00", comments="Source field: user.timezone")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+02:00", comments="Source field: user.timezone")
     public String getTimezone() {
         return timezone;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-10T15:17:04.771+02:00", comments="Source field: user.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-04-16T09:31:19.001+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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 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 Wed Apr 10 15:17:04 CEST 2019
+     * @mbg.generated Tue Apr 16 09:31:19 CEST 2019
      */
     @Override
     public int hashCode() {

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/bulkaction/BulkActionServiceImpl.java

@@ -157,6 +157,7 @@ public class BulkActionServiceImpl implements BulkActionService {
                         this.supporter.get(EntityType.USER),
                         this.supporter.get(EntityType.EXAM),
                         this.supporter.get(EntityType.INDICATOR),
+                        this.supporter.get(EntityType.SEB_CLIENT_CONFIGURATION),
                         this.supporter.get(EntityType.EXAM_CONFIGURATION_MAP),
                         this.supporter.get(EntityType.CLIENT_CONNECTION),
                         this.supporter.get(EntityType.CONFIGURATION_NODE));

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentialService.java

@@ -12,26 +12,53 @@ import ch.ethz.seb.sebserver.gbl.util.Result;
 
 public interface ClientCredentialService {
 
-    Result<ClientCredentials> createGeneratedClientCredentials();
-
     Result<ClientCredentials> createGeneratedClientCredentials(CharSequence salt);
 
-    ClientCredentials encryptedClientCredentials(ClientCredentials clientCredentials);
+    default Result<ClientCredentials> createGeneratedClientCredentials() {
+        return createGeneratedClientCredentials(null);
+    }
 
-    ClientCredentials encryptedClientCredentials(
-            ClientCredentials clientCredentials,
+    ClientCredentials encryptClientCredentials(
+            CharSequence clientIdPlaintext,
+            CharSequence secretPlaintext,
+            CharSequence accessTokenPlaintext,
             CharSequence salt);
 
-    CharSequence getPlainClientId(ClientCredentials credentials);
+    default ClientCredentials encryptClientCredentials(
+            final CharSequence clientIdPlaintext,
+            final CharSequence secretPlaintext) {
+
+        return encryptClientCredentials(clientIdPlaintext, secretPlaintext, null, null);
+    }
+
+    default ClientCredentials encryptClientCredentials(
+            final CharSequence clientIdPlaintext,
+            final CharSequence secretPlaintext,
+            final CharSequence accessTokenPlaintext) {
+
+        return encryptClientCredentials(clientIdPlaintext, secretPlaintext, accessTokenPlaintext, null);
+    }
 
     CharSequence getPlainClientId(ClientCredentials credentials, CharSequence salt);
 
-    CharSequence getPlainClientSecret(ClientCredentials credentials);
+    default CharSequence getPlainClientId(final ClientCredentials credentials) {
+        return getPlainClientId(credentials, null);
+    }
 
     CharSequence getPlainClientSecret(ClientCredentials credentials, CharSequence salt);
 
-    CharSequence getPlainAccessToken(ClientCredentials credentials);
+    default CharSequence getPlainClientSecret(final ClientCredentials credentials) {
+        return getPlainClientSecret(credentials, null);
+    }
 
     CharSequence getPlainAccessToken(ClientCredentials credentials, CharSequence salt);
 
+    default CharSequence getPlainAccessToken(final ClientCredentials credentials) {
+        return getPlainAccessToken(credentials, null);
+    }
+
+    CharSequence encrypt(final CharSequence text);
+
+    CharSequence decrypt(final CharSequence text);
+
 }

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentialServiceImpl.java

@@ -9,6 +9,7 @@
 package ch.ethz.seb.sebserver.webservice.servicelayer.client;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.CharBuffer;
 import java.security.SecureRandom;
 
 import org.apache.commons.lang3.RandomStringUtils;
@@ -33,7 +34,9 @@ public class ClientCredentialServiceImpl implements ClientCredentialService {
     private static final Logger log = LoggerFactory.getLogger(ClientCredentialServiceImpl.class);
 
     static final String SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY = "sebserver.webservice.internalSecret";
-    static final CharSequence DEFAULT_SALT = "b7dbe99bbfa3e21e";
+    static final CharSequence DEFAULT_SALT =
+            CharBuffer.wrap(
+                    new char[] { 'b', '7', 'd', 'b', 'e', '9', '9', 'b', 'b', 'f', 'a', '3', 'e', '2', '1', 'e' });
 
     private final Environment environment;
 
@@ -44,22 +47,16 @@ public class ClientCredentialServiceImpl implements ClientCredentialService {
         this.environment = environment;
     }
 
-    @Override
-    public Result<ClientCredentials> createGeneratedClientCredentials() {
-        return createGeneratedClientCredentials(null);
-    }
-
     @Override
     public Result<ClientCredentials> createGeneratedClientCredentials(final CharSequence salt) {
         return Result.tryCatch(() -> {
-
             try {
-                return encryptedClientCredentials(
-                        new ClientCredentials(
-                                generateClientId().toString(),
-                                generateClientSecret().toString(),
-                                null),
+
+                return encryptClientCredentials(
+                        generateClientId(),
+                        generateClientSecret(),
                         salt);
+
             } catch (final UnsupportedEncodingException e) {
                 log.error("Error while trying to generate client credentials: ", e);
                 throw new RuntimeException("cause: ", e);
@@ -68,38 +65,30 @@ public class ClientCredentialServiceImpl implements ClientCredentialService {
     }
 
     @Override
-    public ClientCredentials encryptedClientCredentials(final ClientCredentials clientCredentials) {
-        return encryptedClientCredentials(clientCredentials, null);
-    }
-
-    @Override
-    public ClientCredentials encryptedClientCredentials(
-            final ClientCredentials clientCredentials,
+    public ClientCredentials encryptClientCredentials(
+            final CharSequence clientIdPlaintext,
+            final CharSequence secretPlaintext,
+            final CharSequence accessTokenPlaintext,
             final CharSequence salt) {
 
         final CharSequence secret = this.environment
                 .getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY);
 
         return new ClientCredentials(
-                (clientCredentials.clientId != null)
-                        ? encrypt(clientCredentials.clientId, secret, salt).toString()
+                (clientIdPlaintext != null)
+                        ? encrypt(clientIdPlaintext, secret, salt).toString()
                         : null,
-                (clientCredentials.secret != null)
-                        ? encrypt(clientCredentials.secret, secret, salt).toString()
+                (secretPlaintext != null)
+                        ? encrypt(secretPlaintext, secret, salt).toString()
                         : null,
-                (clientCredentials.accessToken != null)
-                        ? encrypt(clientCredentials.accessToken, secret, salt).toString()
+                (accessTokenPlaintext != null)
+                        ? encrypt(accessTokenPlaintext, secret, salt).toString()
                         : null);
     }
 
-    @Override
-    public CharSequence getPlainClientId(final ClientCredentials credentials) {
-        return getPlainClientId(credentials, null);
-    }
-
     @Override
     public CharSequence getPlainClientId(final ClientCredentials credentials, final CharSequence salt) {
-        if (credentials == null || credentials.clientId == null) {
+        if (credentials == null || !credentials.hasClientId()) {
             return null;
         }
 
@@ -109,14 +98,9 @@ public class ClientCredentialServiceImpl implements ClientCredentialService {
         return this.decrypt(credentials.clientId, secret, salt);
     }
 
-    @Override
-    public CharSequence getPlainClientSecret(final ClientCredentials credentials) {
-        return getPlainClientSecret(credentials, null);
-    }
-
     @Override
     public CharSequence getPlainClientSecret(final ClientCredentials credentials, final CharSequence salt) {
-        if (credentials == null || credentials.secret == null) {
+        if (credentials == null || !credentials.hasSecret()) {
             return null;
         }
 
@@ -125,14 +109,9 @@ public class ClientCredentialServiceImpl implements ClientCredentialService {
         return this.decrypt(credentials.secret, secret, salt);
     }
 
-    @Override
-    public CharSequence getPlainAccessToken(final ClientCredentials credentials) {
-        return getPlainAccessToken(credentials, null);
-    }
-
     @Override
     public CharSequence getPlainAccessToken(final ClientCredentials credentials, final CharSequence salt) {
-        if (credentials == null || credentials.accessToken == null) {
+        if (credentials == null || !credentials.hasAccessToken()) {
             return null;
         }
 
@@ -141,6 +120,20 @@ public class ClientCredentialServiceImpl implements ClientCredentialService {
         return this.decrypt(credentials.accessToken, secret, salt);
     }
 
+    @Override
+    public CharSequence encrypt(final CharSequence text) {
+        final CharSequence secret = this.environment
+                .getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY);
+        return encrypt(text, secret, null);
+    }
+
+    @Override
+    public CharSequence decrypt(final CharSequence text) {
+        final CharSequence secret = this.environment
+                .getRequiredProperty(SEBSERVER_WEBSERVICE_INTERNAL_SECRET_KEY);
+        return decrypt(text, secret, null);
+    }
+
     CharSequence encrypt(final CharSequence text, final CharSequence secret, final CharSequence salt) {
         if (text == null) {
             throw new IllegalArgumentException("Text has null reference");

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/client/ClientCredentials.java

@@ -10,20 +10,45 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.client;
 
 /** Defines a simple data bean holding (encrypted) client credentials */
 public final class ClientCredentials {
+
     /** The client id or client name parameter */
-    public final String clientId;
+    public final CharSequence clientId;
     /** The client secret parameter */
-    public final String secret;
+    public final CharSequence secret;
     /** An client access token if supported */
-    public final String accessToken;
+    public final CharSequence accessToken;
 
     public ClientCredentials(
-            final String clientId,
-            final String secret,
-            final String accessToken) {
+            final CharSequence clientId,
+            final CharSequence secret,
+            final CharSequence accessToken) {
 
         this.clientId = clientId;
         this.secret = secret;
         this.accessToken = accessToken;
     }
+
+    public boolean hasClientId() {
+        return this.clientId != null && this.clientId.length() >= 0;
+    }
+
+    public boolean hasSecret() {
+        return this.secret != null && this.secret.length() >= 0;
+    }
+
+    public boolean hasAccessToken() {
+        return this.accessToken != null && this.accessToken.length() >= 0;
+    }
+
+    public String clientIdAsString() {
+        return hasClientId() ? this.clientId.toString() : null;
+    }
+
+    public String secretAsString() {
+        return hasSecret() ? this.secret.toString() : null;
+    }
+
+    public String accessTokenAsString() {
+        return hasAccessToken() ? this.accessToken.toString() : null;
+    }
 }

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/SebClientConfigDAO.java

@@ -8,7 +8,7 @@
 
 package ch.ethz.seb.sebserver.webservice.servicelayer.dao;
 
-import ch.ethz.seb.sebserver.gbl.model.institution.SebClientConfig;
+import ch.ethz.seb.sebserver.gbl.model.sebconfig.SebClientConfig;
 import ch.ethz.seb.sebserver.gbl.util.Result;
 import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionSupportDAO;
 import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentials;
@@ -25,4 +25,11 @@ public interface SebClientConfigDAO extends
      * @return the configured ClientCredentials for a given SebClientConfig */
     Result<ClientCredentials> getSebClientCredentials(String modelId);
 
+    /** Get the stored encrypted configuration password from a specified SEB client configuration.
+     * The SEB client configuration password is used to encrypt a SEB Client Configuration
+     *
+     * @param modelId the model
+     * @return encrypted configuration password */
+    Result<CharSequence> getConfigPasswortCipher(String modelId);
+
 }

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/LmsSetupDAOImpl.java

@@ -24,7 +24,10 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+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.model.Domain;
 import ch.ethz.seb.sebserver.gbl.model.EntityKey;
 import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup;
 import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType;
@@ -133,11 +136,12 @@ public class LmsSetupDAOImpl implements LmsSetupDAO {
     public Result<LmsSetup> save(final LmsSetup lmsSetup) {
         return Result.tryCatch(() -> {
 
-            final ClientCredentials lmsCredentials = this.clientCredentialService.encryptedClientCredentials(
-                    new ClientCredentials(
-                            lmsSetup.lmsAuthName,
-                            lmsSetup.lmsAuthSecret,
-                            lmsSetup.lmsRestApiToken));
+            checkUniqueName(lmsSetup);
+
+            final ClientCredentials lmsCredentials = this.clientCredentialService.encryptClientCredentials(
+                    lmsSetup.lmsAuthName,
+                    lmsSetup.lmsAuthSecret,
+                    lmsSetup.lmsRestApiToken);
 
             final LmsSetupRecord newRecord = new LmsSetupRecord(
                     lmsSetup.id,
@@ -145,9 +149,9 @@ public class LmsSetupDAOImpl implements LmsSetupDAO {
                     lmsSetup.name,
                     (lmsSetup.lmsType != null) ? lmsSetup.lmsType.name() : null,
                     lmsSetup.lmsApiUrl,
-                    lmsCredentials.clientId,
-                    lmsCredentials.secret,
-                    lmsCredentials.accessToken,
+                    lmsCredentials.clientIdAsString(),
+                    lmsCredentials.secretAsString(),
+                    lmsCredentials.accessTokenAsString(),
                     null);
 
             this.lmsSetupRecordMapper.updateByPrimaryKeySelective(newRecord);
@@ -162,11 +166,12 @@ public class LmsSetupDAOImpl implements LmsSetupDAO {
     public Result<LmsSetup> createNew(final LmsSetup lmsSetup) {
         return Result.tryCatch(() -> {
 
-            final ClientCredentials lmsCredentials = this.clientCredentialService.encryptedClientCredentials(
-                    new ClientCredentials(
-                            lmsSetup.lmsAuthName,
-                            lmsSetup.lmsAuthSecret,
-                            lmsSetup.lmsRestApiToken));
+            checkUniqueName(lmsSetup);
+
+            final ClientCredentials lmsCredentials = this.clientCredentialService.encryptClientCredentials(
+                    lmsSetup.lmsAuthName,
+                    lmsSetup.lmsAuthSecret,
+                    lmsSetup.lmsRestApiToken);
 
             final LmsSetupRecord newRecord = new LmsSetupRecord(
                     null,
@@ -174,9 +179,9 @@ public class LmsSetupDAOImpl implements LmsSetupDAO {
                     lmsSetup.name,
                     (lmsSetup.lmsType != null) ? lmsSetup.lmsType.name() : null,
                     lmsSetup.lmsApiUrl,
-                    lmsCredentials.clientId,
-                    lmsCredentials.secret,
-                    lmsCredentials.accessToken,
+                    lmsCredentials.clientIdAsString(),
+                    lmsCredentials.secretAsString(),
+                    lmsCredentials.accessTokenAsString(),
                     BooleanUtils.toInteger(false));
 
             this.lmsSetupRecordMapper.insert(newRecord);
@@ -327,4 +332,23 @@ public class LmsSetupDAOImpl implements LmsSetupDAO {
                 BooleanUtils.toBooleanObject(record.getActive())));
     }
 
+    // check if same name already exists for the same institution
+    // if true an APIMessageException with a field validation error is thrown
+    private void checkUniqueName(final LmsSetup lmsSetup) {
+
+        final Long otherWithSameName = this.lmsSetupRecordMapper
+                .countByExample()
+                .where(LmsSetupRecordDynamicSqlSupport.name, isEqualTo(lmsSetup.name))
+                .and(LmsSetupRecordDynamicSqlSupport.institutionId, isEqualTo(lmsSetup.institutionId))
+                .and(LmsSetupRecordDynamicSqlSupport.id, isNotEqualToWhenPresent(lmsSetup.id))
+                .build()
+                .execute();
+
+        if (otherWithSameName != null && otherWithSameName.longValue() > 0) {
+            throw new APIMessageException(APIMessage.fieldValidationError(
+                    Domain.LMS_SETUP.ATTR_NAME,
+                    "lmsSetup:name:name.notunique"));
+        }
+    }
+
 }

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SebClientConfigDAOImpl.java

@@ -26,9 +26,13 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import ch.ethz.seb.sebserver.gbl.api.APIMessage;
+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.Domain;
 import ch.ethz.seb.sebserver.gbl.model.EntityKey;
-import ch.ethz.seb.sebserver.gbl.model.institution.SebClientConfig;
+import ch.ethz.seb.sebserver.gbl.model.sebconfig.SebClientConfig;
 import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
 import ch.ethz.seb.sebserver.gbl.util.Result;
 import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.SebClientConfigRecordDynamicSqlSupport;
@@ -149,7 +153,7 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO {
 
             final List<Long> ids = extractListOfPKs(all);
             final SebClientConfigRecord record = new SebClientConfigRecord(
-                    null, null, null, null, null, null,
+                    null, null, null, null, null, null, null,
                     BooleanUtils.toIntegerObject(active));
 
             this.sebClientConfigRecordMapper.updateByExampleSelective(record)
@@ -169,13 +173,17 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO {
         return this.clientCredentialService
                 .createGeneratedClientCredentials()
                 .map(cc -> {
+
+                    checkUniqueName(sebClientConfig);
+
                     final SebClientConfigRecord newRecord = new SebClientConfigRecord(
                             null,
                             sebClientConfig.institutionId,
                             sebClientConfig.name,
                             DateTime.now(DateTimeZone.UTC),
-                            cc.clientId,
-                            cc.secret,
+                            cc.clientIdAsString(),
+                            cc.secretAsString(),
+                            getEncryptionPassword(sebClientConfig),
                             BooleanUtils.toInteger(BooleanUtils.isTrue(sebClientConfig.active)));
 
                     this.sebClientConfigRecordMapper.insert(newRecord);
@@ -190,6 +198,8 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO {
     public Result<SebClientConfig> save(final SebClientConfig sebClientConfig) {
         return Result.tryCatch(() -> {
 
+            checkUniqueName(sebClientConfig);
+
             final SebClientConfigRecord newRecord = new SebClientConfigRecord(
                     sebClientConfig.id,
                     null,
@@ -197,6 +207,7 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO {
                     null,
                     null,
                     null,
+                    getEncryptionPassword(sebClientConfig),
                     null);
 
             this.sebClientConfigRecordMapper.updateByPrimaryKeySelective(newRecord);
@@ -255,7 +266,17 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO {
     @Transactional(readOnly = true)
     public Result<ClientCredentials> getSebClientCredentials(final String modelId) {
         return recordByModelId(modelId)
-                .map(rec -> new ClientCredentials(rec.getClientName(), rec.getClientSecret(), null));
+                .map(rec -> new ClientCredentials(
+                        rec.getClientName(),
+                        rec.getClientSecret(),
+                        null));
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public Result<CharSequence> getConfigPasswortCipher(final String modelId) {
+        return recordByModelId(modelId)
+                .map(rec -> rec.getEncryptSecret());
     }
 
     private Result<Collection<EntityKey>> allIdsOfInstitution(final EntityKey institutionKey) {
@@ -295,7 +316,40 @@ public class SebClientConfigDAOImpl implements SebClientConfigDAO {
                 record.getInstitutionId(),
                 record.getName(),
                 record.getDate(),
+                null,
+                null,
                 BooleanUtils.toBooleanObject(record.getActive())));
     }
 
+    private String getEncryptionPassword(final SebClientConfig sebClientConfig) {
+        if (sebClientConfig.hasEncryptionSecret() &&
+                !sebClientConfig.encryptSecret.equals(sebClientConfig.confirmEncryptSecret)) {
+            throw new APIMessageException(ErrorMessage.PASSWORD_MISMATCH);
+        }
+
+        final CharSequence encrypted_encrypt_secret = sebClientConfig.hasEncryptionSecret()
+                ? this.clientCredentialService.encrypt(sebClientConfig.encryptSecret)
+                : null;
+        return (encrypted_encrypt_secret != null) ? encrypted_encrypt_secret.toString() : null;
+    }
+
+    // check if same name already exists for the same institution
+    // if true an APIMessageException with a field validation error is thrown
+    private void checkUniqueName(final SebClientConfig sebClientConfig) {
+
+        final Long otherWithSameName = this.sebClientConfigRecordMapper
+                .countByExample()
+                .where(SebClientConfigRecordDynamicSqlSupport.name, isEqualTo(sebClientConfig.name))
+                .and(SebClientConfigRecordDynamicSqlSupport.institutionId, isEqualTo(sebClientConfig.institutionId))
+                .and(SebClientConfigRecordDynamicSqlSupport.id, isNotEqualToWhenPresent(sebClientConfig.id))
+                .build()
+                .execute();
+
+        if (otherWithSameName != null && otherWithSameName.longValue() > 0) {
+            throw new APIMessageException(APIMessage.fieldValidationError(
+                    Domain.SEB_CLIENT_CONFIGURATION.ATTR_NAME,
+                    "clientconfig:name:name.notunique"));
+        }
+    }
+
 }

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

@@ -90,12 +90,12 @@ public interface LmsAPITemplate {
                     LMS_SETUP.ATTR_LMS_URL,
                     "lmsSetup:lmsUrl:notNull"));
         }
-        if (StringUtils.isBlank(credentials.clientId)) {
+        if (!credentials.hasClientId()) {
             missingAttrs.add(APIMessage.fieldValidationError(
                     LMS_SETUP.ATTR_LMS_CLIENTNAME,
                     "lmsSetup:lmsClientname:notNull"));
         }
-        if (StringUtils.isBlank(credentials.secret)) {
+        if (!credentials.hasSecret()) {
             missingAttrs.add(APIMessage.fieldValidationError(
                     LMS_SETUP.ATTR_LMS_CLIENTSECRET,
                     "lmsSetup:lmsClientsecret:notNull"));

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/LmsAPIServiceImpl.java

@@ -143,11 +143,10 @@ public class LmsAPIServiceImpl implements LmsAPIService {
 
     @Override
     public LmsSetupTestResult testAdHoc(final LmsSetup lmsSetup) {
-        final ClientCredentials lmsCredentials = this.clientCredentialService.encryptedClientCredentials(
-                new ClientCredentials(
-                        lmsSetup.lmsAuthName,
-                        lmsSetup.lmsAuthSecret,
-                        lmsSetup.lmsRestApiToken));
+        final ClientCredentials lmsCredentials = this.clientCredentialService.encryptClientCredentials(
+                lmsSetup.lmsAuthName,
+                lmsSetup.lmsAuthSecret,
+                lmsSetup.lmsRestApiToken);
 
         return createLmsSetupTemplate(lmsSetup, lmsCredentials).testLmsSetup();
     }

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

@@ -14,7 +14,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -132,12 +131,12 @@ final class MockupLmsAPITemplate implements LmsAPITemplate {
         try {
 
             final CharSequence plainClientId = this.clientCredentialService.getPlainClientId(this.credentials);
-            if (StringUtils.isBlank(plainClientId)) {
+            if (plainClientId == null || plainClientId.length() <= 0) {
                 throw new IllegalAccessException("Wrong client credential");
             }
 
             final CharSequence plainClientSecret = this.clientCredentialService.getPlainClientSecret(this.credentials);
-            if (StringUtils.isBlank(plainClientSecret)) {
+            if (plainClientSecret == null || plainClientSecret.length() <= 0) {
                 throw new IllegalAccessException("Wrong client credential");
             }
 

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/seb/SebClientConfigService.java

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-package ch.ethz.seb.sebserver.webservice.servicelayer.seb;
-
-import java.io.InputStream;
-
-import ch.ethz.seb.sebserver.gbl.model.institution.SebClientConfig;
-import ch.ethz.seb.sebserver.gbl.util.Result;
-
-public interface SebClientConfigService {
-
-    boolean hasSebClientConfigurationForIntitution(Long institutionId);
-
-    Result<SebClientConfig> autoCreateSebClientConfigurationForIntitution(Long institutionId);
-
-    Result<InputStream> exportSebClientConfigurationOfInstitution(Long institutionId);
-
-    default Result<InputStream> exportSebClientConfiguration(final String modelId) {
-        return Result.tryCatchOf(() -> {
-            return exportSebClientConfigurationOfInstitution(Long.parseLong(modelId));
-        });
-    }
-
-}

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/SebClientConfigService.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019 ETH Zürich, Educational Development and Technology (LET)
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+package ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig;
+
+import java.io.InputStream;
+
+import ch.ethz.seb.sebserver.gbl.model.sebconfig.SebClientConfig;
+import ch.ethz.seb.sebserver.gbl.util.Result;
+
+public interface SebClientConfigService {
+
+    static String SEB_CLIENT_CONFIG_EXAMPLE_XML =
+            "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" " +
+                    "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" +
+                    "<plist version=\"1.0\">" +
+                    "<dict>" +
+                    "<key>sebServerConfiguration</key>" +
+                    "<array>" +
+                    "<dict>" +
+                    "<key>serverURL</key>" +
+                    "<string>%s</string>" +
+                    "<key>institution</key>" +
+                    "<string>%s</string>" +
+                    "<key>clientName</key>" +
+                    "<string>%s</string>" +
+                    "<key>clientSecret</key>" +
+                    "<string>%s</string>" +
+                    "<key>accessTokenEndpoint</key>" +
+                    "<string>%s</string>" +
+                    "<key>handshakeEndpoint</key>" +
+                    "<string>%s</string>" +
+                    "<key>examConfigEndpoint</key>" +
+                    "<string>%s</string>" +
+                    "<key>pingEndpoint</key>" +
+                    "<string>%s</string>" +
+                    "<key>eventEndpoint</key>" +
+                    "<string>%s</string>" +
+                    "</dict>" +
+                    "</array>" +
+                    "</dict>" +
+                    "</plist>";
+
+    boolean hasSebClientConfigurationForIntitution(Long institutionId);
+
+    Result<SebClientConfig> autoCreateSebClientConfigurationForIntitution(Long institutionId);
+
+    Result<InputStream> exportSebClientConfiguration(final String modelId);
+
+}

src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/SebClientConfigServiceImpl.java

@@ -6,24 +6,28 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-package ch.ethz.seb.sebserver.webservice.servicelayer.seb;
+package ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
+import java.nio.CharBuffer;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 import java.util.UUID;
 
+import org.cryptonode.jncryptor.AES256JNCryptor;
+import org.cryptonode.jncryptor.CryptorException;
+import org.cryptonode.jncryptor.JNCryptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import ch.ethz.seb.sebserver.gbl.api.API;
 import ch.ethz.seb.sebserver.gbl.model.institution.Institution;
-import ch.ethz.seb.sebserver.gbl.model.institution.SebClientConfig;
+import ch.ethz.seb.sebserver.gbl.model.sebconfig.SebClientConfig;
 import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
 import ch.ethz.seb.sebserver.gbl.util.Result;
 import ch.ethz.seb.sebserver.webservice.servicelayer.client.ClientCredentialService;
@@ -36,6 +40,8 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.dao.SebClientConfigDAO;
 @WebServiceProfile
 public class SebClientConfigServiceImpl implements SebClientConfigService {
 
+    private static final Logger log = LoggerFactory.getLogger(SebClientConfigServiceImpl.class);
+
     private final InstitutionDAO institutionDAO;
     private final SebClientConfigDAO sebClientConfigDAO;
     private final ClientCredentialService clientCredentialService;
@@ -44,6 +50,8 @@ public class SebClientConfigServiceImpl implements SebClientConfigService {
     private final String serverPort;
     private final String sebClientAPIEndpoint;
 
+    private final JNCryptor cryptor = new AES256JNCryptor();
+
     protected SebClientConfigServiceImpl(
             final InstitutionDAO institutionDAO,
             final SebClientConfigDAO sebClientConfigDAO,
@@ -80,38 +88,19 @@ public class SebClientConfigServiceImpl implements SebClientConfigService {
                     institutionId,
                     institution.name + "_" + UUID.randomUUID(),
                     null,
+                    null,
+                    null,
                     true);
         })
                 .flatMap(this.sebClientConfigDAO::createNew);
     }
 
     @Override
-    public Result<InputStream> exportSebClientConfigurationOfInstitution(final Long institutionId) {
-        return Result.tryCatchOf(() -> {
-            final List<SebClientConfig> sebConfigs = new ArrayList<>(this.sebClientConfigDAO
-                    .all(institutionId, true)
-                    .getOrThrow());
-
-            if (sebConfigs.isEmpty()) {
-                return autoCreateSebClientConfigurationForIntitution(institutionId)
-                        .flatMap(this::createExport);
-            }
-
-            Collections.sort(sebConfigs, (sc1, sc2) -> sc1.date.compareTo(sc2.date));
-            return this.createExport(sebConfigs.get(0));
-        });
+    public Result<InputStream> exportSebClientConfiguration(final String modelId) {
+        return this.sebClientConfigDAO.byModelId(modelId)
+                .flatMap(this::createExport);
     }
 
-    private final static String SEB_CLIENT_CONFIG_EXAMPLE_XML =
-            "<SEBClientConfig>"
-                    + "<SEBServerConnection>"
-                    + "<SEBServerAddress>%s</SEBServerAddress>"
-                    + "<InstitutionIdentifier>%s</InstitutionIdentifier>"
-                    + "<ClientName>%s</ClientName>"
-                    + "<ClientSecret>%s</ClientSecret>"
-                    + "</SEBServerConnection>"
-                    + "</SEBClientConfig>";
-
     private final Result<InputStream> createExport(final SebClientConfig config) {
         // TODO implementation of creation of SEB client configuration for specified Institution
         // A SEB start configuration should at least contain the SEB-Client-Credentials to access the SEB Server API
@@ -127,27 +116,47 @@ public class SebClientConfigServiceImpl implements SebClientConfigService {
                     .scheme(this.httpScheme)
                     .host(this.serverAddress)
                     .port(this.serverPort)
-                    .path(this.sebClientAPIEndpoint)
                     .toUriString();
 
             final ClientCredentials sebClientCredentials = this.sebClientConfigDAO
                     .getSebClientCredentials(config.getModelId())
                     .getOrThrow();
 
+            final CharSequence encryptionPassword = this.sebClientConfigDAO
+                    .getConfigPasswortCipher(config.getModelId())
+                    .getOrThrow();
+
             final CharSequence plainClientId = this.clientCredentialService
                     .getPlainClientId(sebClientCredentials);
             final CharSequence plainClientSecret = this.clientCredentialService
                     .getPlainClientSecret(sebClientCredentials);
 
             try {
-                return new ByteArrayInputStream(
-                        String.format(
-                                SEB_CLIENT_CONFIG_EXAMPLE_XML,
-                                serverURL,
-                                String.valueOf(config.institutionId),
-                                plainClientId,
-                                plainClientSecret)
-                                .getBytes("UTF-8"));
+
+                final byte[] plainTextConfig = String.format(
+                        SEB_CLIENT_CONFIG_EXAMPLE_XML,
+                        serverURL,
+                        String.valueOf(config.institutionId),
+                        plainClientId,
+                        plainClientSecret,
+                        API.OAUTH_TOKEN_ENDPOINT,
+                        this.sebClientAPIEndpoint + API.EXAM_API_HANDSHAKE_ENDPOINT,
+                        this.sebClientAPIEndpoint + API.EXAM_API_CONFIGURATION_REQUEST_ENDPOINT,
+                        this.sebClientAPIEndpoint + API.EXAM_API_PING_ENDPOINT,
+                        this.sebClientAPIEndpoint + API.EXAM_API_EVENT_ENDPOINT)
+                        .getBytes("UTF-8");
+
+                if (encryptionPassword != null) {
+                    final CharSequence encryptionPasswordPlaintext = this.clientCredentialService
+                            .decrypt(encryptionPassword);
+
+                    return new ByteArrayInputStream(encode(
+                            plainTextConfig,
+                            encryptionPasswordPlaintext));
+                } else {
+                    return new ByteArrayInputStream(plainTextConfig);
+                }
+
             } catch (final UnsupportedEncodingException e) {
                 throw new RuntimeException("cause: ", e);
             }
@@ -155,4 +164,17 @@ public class SebClientConfigServiceImpl implements SebClientConfigService {
         });
     }
 
+    private byte[] encode(final byte[] plainTextConfig, final CharSequence secret) {
+
+        // TODO format the plainTextConfig for SEB Client encoding format
+
+        try {
+            // TODO do we need salt
+            return this.cryptor.encryptData(plainTextConfig, CharBuffer.wrap(secret).array());
+        } catch (final CryptorException e) {
+            log.error("Unexpected error while trying to encrypt SEB Client configuration: ", e);
+            return plainTextConfig;
+        }
+    }
+
 }

src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/InstitutionController.java

@@ -8,23 +8,13 @@
 
 package ch.ethz.seb.sebserver.webservice.weblayer.api;
 
-import java.io.InputStream;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.mybatis.dynamic.sql.SqlTable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import ch.ethz.seb.sebserver.gbl.api.API;
-import ch.ethz.seb.sebserver.gbl.api.EntityType;
 import ch.ethz.seb.sebserver.gbl.api.POSTMapper;
-import ch.ethz.seb.sebserver.gbl.authorization.PrivilegeType;
 import ch.ethz.seb.sebserver.gbl.model.institution.Institution;
 import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
 import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.InstitutionRecordDynamicSqlSupport;
@@ -34,7 +24,6 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.SEBServerUser
 import ch.ethz.seb.sebserver.webservice.servicelayer.bulkaction.BulkActionService;
 import ch.ethz.seb.sebserver.webservice.servicelayer.dao.InstitutionDAO;
 import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO;
-import ch.ethz.seb.sebserver.webservice.servicelayer.seb.SebClientConfigService;
 import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationService;
 
 @WebServiceProfile
@@ -43,7 +32,6 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationSe
 public class InstitutionController extends ActivatableEntityController<Institution, Institution> {
 
     private final InstitutionDAO institutionDAO;
-    private final SebClientConfigService sebClientConfigService;
 
     public InstitutionController(
             final InstitutionDAO institutionDAO,
@@ -51,8 +39,7 @@ public class InstitutionController extends ActivatableEntityController<Instituti
             final UserActivityLogDAO userActivityLogDAO,
             final BulkActionService bulkActionService,
             final PaginationService paginationService,
-            final BeanValidationService beanValidationService,
-            final SebClientConfigService sebClientConfigService) {
+            final BeanValidationService beanValidationService) {
 
         super(authorization,
                 bulkActionService,
@@ -62,7 +49,6 @@ public class InstitutionController extends ActivatableEntityController<Instituti
                 beanValidationService);
 
         this.institutionDAO = institutionDAO;
-        this.sebClientConfigService = sebClientConfigService;
     }
 
     @Override
@@ -80,27 +66,6 @@ public class InstitutionController extends ActivatableEntityController<Instituti
         return this.institutionDAO.byPK(institutionId).getOrThrow();
     }
 
-    @RequestMapping(
-            path = API.INSTITUTION_VAR_PATH_SEGMENT + API.SEB_CONFIG_EXPORT_PATH_SEGMENT,
-            method = RequestMethod.GET,
-            produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) // TODO check if this is the right format
-    public void downloadSEBConfig(
-            @PathVariable final Long institutionId,
-            final HttpServletResponse response) throws Exception {
-
-        this.authorization.check(PrivilegeType.WRITE, EntityType.SEB_CLIENT_CONFIGURATION);
-
-        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-        response.setStatus(HttpStatus.OK.value());
-
-        final InputStream sebConfigFileIn = this.sebClientConfigService
-                .exportSebClientConfigurationOfInstitution(institutionId)
-                .getOrThrow();
-
-        IOUtils.copyLarge(sebConfigFileIn, response.getOutputStream());
-        response.flushBuffer();
-    }
-
     @Override
     protected Institution createNew(final POSTMapper postParams) {
         return new Institution(null, postParams);

src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/SebClientConfigController.java

@@ -0,0 +1,140 @@
+/*
+ * 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 java.io.InputStream;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tomcat.util.http.fileupload.IOUtils;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.mybatis.dynamic.sql.SqlTable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import ch.ethz.seb.sebserver.gbl.Constants;
+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.POSTMapper;
+import ch.ethz.seb.sebserver.gbl.model.Domain;
+import ch.ethz.seb.sebserver.gbl.model.sebconfig.SebClientConfig;
+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.SebClientConfigRecordDynamicSqlSupport;
+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.SebClientConfigDAO;
+import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO;
+import ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig.SebClientConfigService;
+import ch.ethz.seb.sebserver.webservice.servicelayer.validation.BeanValidationService;
+
+@WebServiceProfile
+@RestController
+@RequestMapping("/${sebserver.webservice.api.admin.endpoint}" + API.SEB_CLIENT_CONFIG_ENDPOINT)
+public class SebClientConfigController extends ActivatableEntityController<SebClientConfig, SebClientConfig> {
+
+    private final SebClientConfigService sebClientConfigService;
+
+    public SebClientConfigController(
+            final SebClientConfigDAO sebClientConfigDAO,
+            final AuthorizationService authorization,
+            final UserActivityLogDAO userActivityLogDAO,
+            final BulkActionService bulkActionService,
+            final PaginationService paginationService,
+            final BeanValidationService beanValidationService,
+            final SebClientConfigService sebClientConfigService) {
+
+        super(authorization,
+                bulkActionService,
+                sebClientConfigDAO,
+                userActivityLogDAO,
+                paginationService,
+                beanValidationService);
+
+        this.sebClientConfigService = sebClientConfigService;
+    }
+
+    @RequestMapping(
+            path = API.SEB_CLIENT_CONFIG_DOWNLOAD_PATH_SEGMENT + API.MODEL_ID_VAR_PATH_SEGMENT,
+            method = RequestMethod.GET,
+            produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+    public void downloadSEBConfig(
+            @PathVariable final String modelId,
+            final HttpServletResponse response) throws Exception {
+
+        this.entityDAO.byModelId(modelId)
+                .map(this.authorization::checkWrite);
+
+        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        response.setStatus(HttpStatus.OK.value());
+
+        final InputStream sebConfigFileIn = this.sebClientConfigService
+                .exportSebClientConfiguration(modelId)
+                .getOrThrow();
+
+        IOUtils.copyLarge(sebConfigFileIn, response.getOutputStream());
+        response.flushBuffer();
+    }
+
+    @Override
+    protected SebClientConfig createNew(final POSTMapper postParams) {
+
+        final Long institutionId = postParams.getLong(
+                Domain.SEB_CLIENT_CONFIGURATION.ATTR_INSTITUTION_ID);
+
+        if (institutionId == null) {
+            throw new IllegalAPIArgumentException("Institution identifier is missing");
+        }
+
+        postParams.putIfAbsent(
+                Domain.SEB_CLIENT_CONFIGURATION.ATTR_DATE,
+                DateTime.now(DateTimeZone.UTC).toString(Constants.DEFAULT_DATE_TIME_FORMAT));
+
+        return new SebClientConfig(institutionId, postParams);
+    }
+
+    @Override
+    protected SqlTable getSQLTableOfEntity() {
+        return SebClientConfigRecordDynamicSqlSupport.sebClientConfigRecord;
+    }
+
+    @Override
+    protected Result<SebClientConfig> validForCreate(final SebClientConfig entity) {
+        return super.validForCreate(entity)
+                .map(this::checkPasswordMatch);
+    }
+
+    @Override
+    protected Result<SebClientConfig> validForSave(final SebClientConfig entity) {
+        return super.validForSave(entity)
+                .map(this::checkPasswordMatch);
+    }
+
+    private SebClientConfig checkPasswordMatch(final SebClientConfig entity) {
+        if (entity.hasEncryptionSecret() && !entity.encryptSecret.equals(entity.confirmEncryptSecret)) {
+            throw new APIMessageException(APIMessage.fieldValidationError(
+                    new FieldError(
+                            Domain.SEB_CLIENT_CONFIGURATION.TYPE_NAME,
+                            PasswordChange.ATTR_NAME_PASSWORD,
+                            "clientConfig:confirm_encrypt_secret:password.mismatch")));
+        }
+
+        return entity;
+    }
+
+}

src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/oauth/RevokeTokenEndpoint.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
+import ch.ethz.seb.sebserver.gbl.api.API;
 import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
 
 /** Spring MVC controller that defines a revoke token endpoint */
@@ -44,7 +45,7 @@ public class RevokeTokenEndpoint {
         this.tokenStore = tokenStore;
     }
 
-    @RequestMapping(value = "/oauth/revoke-token", method = RequestMethod.DELETE)
+    @RequestMapping(value = API.OAUTH_REVOKE_TOKEN_ENDPOINT, method = RequestMethod.DELETE)
     @ResponseStatus(HttpStatus.OK)
     public void logout(final HttpServletRequest request) {
         final String authHeader = request.getHeader("Authorization");