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

SEBSERV-21 different fixes

Browse source
This commit is contained in:
anhefti 2019-02-25 16:57:37 +01:00
parent 97bf08e602
commit 87ccf5b2a4
90 changed files with 1130 additions and 1026 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ package ch.ethz.seb.sebserver.gbl.api;
import javax.annotation.Generated; import javax.annotation.Generated;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-02-13T15:21:36.741+01:00") @Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-02-25T10:55:53.580+01:00")
public enum EntityType { public enum EntityType {
CONFIGURATION_ATTRIBUTE, CONFIGURATION_ATTRIBUTE,
CONFIGURATION_VALUE, CONFIGURATION_VALUE,

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

@ -5,7 +5,7 @@ import javax.annotation.Generated;
/** Defines the global names of the domain model and domain model fields. /** Defines the global names of the domain model and domain model fields.
* This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within the integrated GUI * This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within the integrated GUI
* This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/ * This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/
@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-02-13T15:21:36.659+01:00") @Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-02-25T10:55:53.537+01:00")
public interface Domain { public interface Domain {
interface CONFIGURATION_ATTRIBUTE { interface CONFIGURATION_ATTRIBUTE {
@ -173,7 +173,7 @@ public interface Domain {
String ATTR_USERNAME = "username"; String ATTR_USERNAME = "username";
String ATTR_PASSWORD = "password"; String ATTR_PASSWORD = "password";
String ATTR_EMAIL = "email"; String ATTR_EMAIL = "email";
String ATTR_LOCALE = "locale"; String ATTR_LANGUAGE = "language";
String ATTR_TIMEZONE = "timezone"; String ATTR_TIMEZONE = "timezone";
String ATTR_ACTIVE = "active"; String ATTR_ACTIVE = "active";
} }

5
src/main/java/ch/ethz/seb/sebserver/gbl/model/user/PasswordChange.java
View file

@ -28,15 +28,16 @@ public class PasswordChange implements Entity {
@JsonProperty(USER.ATTR_UUID) @JsonProperty(USER.ATTR_UUID)
public final String userId; public final String userId;
@NotNull(message = "user:password:notNull") @NotNull(message = "user:oldPassword:notNull")
@JsonProperty(ATTR_NAME_OLD_PASSWORD) @JsonProperty(ATTR_NAME_OLD_PASSWORD)
private final String oldPassword; private final String oldPassword;
@NotNull(message = "user:password:notNull") @NotNull(message = "user:newPassword:notNull")
@Size(min = 8, max = 255, message = "user:newPassword:size:{min}:{max}:${validatedValue}") @Size(min = 8, max = 255, message = "user:newPassword:size:{min}:{max}:${validatedValue}")
@JsonProperty(ATTR_NAME_NEW_PASSWORD) @JsonProperty(ATTR_NAME_NEW_PASSWORD)
private final String newPassword; private final String newPassword;
@NotNull(message = "user:retypedNewPassword:notNull")
@JsonProperty(ATTR_NAME_RETYPED_NEW_PASSWORD) @JsonProperty(ATTR_NAME_RETYPED_NEW_PASSWORD)
private final String retypedNewPassword; private final String retypedNewPassword;

2
src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserAccount.java
View file

@ -35,7 +35,7 @@ public interface UserAccount extends GrantEntity {
boolean isActive(); boolean isActive();
Locale getLocale(); Locale getLanguage();
DateTimeZone getTimeZone(); DateTimeZone getTimeZone();

23
src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfo.java
View file

@ -13,6 +13,7 @@ import java.util.Locale;
import java.util.Set; import java.util.Set;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
@ -44,7 +45,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
public static final String FILTER_ATTR_USER_NAME = "username"; public static final String FILTER_ATTR_USER_NAME = "username";
public static final String FILTER_ATTR_EMAIL = "email"; public static final String FILTER_ATTR_EMAIL = "email";
public static final String FILTER_ATTR_LOCALE = "locale"; public static final String FILTER_ATTR_LANGUAGE = "language";
/** The user's UUID */ /** The user's UUID */
@JsonProperty(USER.ATTR_UUID) @JsonProperty(USER.ATTR_UUID)
@ -78,9 +79,9 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
public final Boolean active; public final Boolean active;
/** The users locale */ /** The users locale */
@NotNull(message = "user:locale:notNull") @NotNull(message = "user:language:notNull")
@JsonProperty(USER.ATTR_LOCALE) @JsonProperty(USER.ATTR_LANGUAGE)
public final Locale locale; public final Locale language;
/** The users time zone */ /** The users time zone */
@NotNull(message = "user:timeZone:notNull") @NotNull(message = "user:timeZone:notNull")
@ -88,6 +89,8 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
public final DateTimeZone timeZone; public final DateTimeZone timeZone;
/** The users roles in a unmodifiable set. Is never null */ /** The users roles in a unmodifiable set. Is never null */
@NotNull(message = "user:userRoles:notNull")
@NotEmpty(message = "user:userRoles:notNull")
@JsonProperty(USER_ROLE.REFERENCE_NAME) @JsonProperty(USER_ROLE.REFERENCE_NAME)
public final Set<String> roles; public final Set<String> roles;
@ -100,7 +103,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
@JsonProperty(USER.ATTR_USERNAME) final String username, @JsonProperty(USER.ATTR_USERNAME) final String username,
@JsonProperty(USER.ATTR_EMAIL) final String email, @JsonProperty(USER.ATTR_EMAIL) final String email,
@JsonProperty(USER.ATTR_ACTIVE) final Boolean active, @JsonProperty(USER.ATTR_ACTIVE) final Boolean active,
@JsonProperty(USER.ATTR_LOCALE) final Locale locale, @JsonProperty(USER.ATTR_LANGUAGE) final Locale language,
@JsonProperty(USER.ATTR_TIMEZONE) final DateTimeZone timeZone, @JsonProperty(USER.ATTR_TIMEZONE) final DateTimeZone timeZone,
@JsonProperty(USER_ROLE.REFERENCE_NAME) final Set<String> roles) { @JsonProperty(USER_ROLE.REFERENCE_NAME) final Set<String> roles) {
@ -110,7 +113,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
this.username = username; this.username = username;
this.email = email; this.email = email;
this.active = BooleanUtils.isTrue(active); this.active = BooleanUtils.isTrue(active);
this.locale = locale; this.language = language;
this.timeZone = timeZone; this.timeZone = timeZone;
this.roles = Utils.immutableSetOf(roles); this.roles = Utils.immutableSetOf(roles);
} }
@ -165,8 +168,8 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
} }
@Override @Override
public Locale getLocale() { public Locale getLanguage() {
return this.locale; return this.language;
} }
@Override @Override
@ -241,7 +244,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
public String toString() { public String toString() {
return "UserInfo [uuid=" + this.uuid + ", institutionId=" + this.institutionId + ", name=" + this.name return "UserInfo [uuid=" + this.uuid + ", institutionId=" + this.institutionId + ", name=" + this.name
+ ", username=" + ", username="
+ this.username + ", email=" + this.email + ", active=" + this.active + ", locale=" + this.locale + this.username + ", email=" + this.email + ", active=" + this.active + ", language=" + this.language
+ ", timeZone=" + this.timeZone + ", timeZone=" + this.timeZone
+ ", roles=" + this.roles + "]"; + ", roles=" + this.roles + "]";
} }
@ -258,7 +261,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
userInfo.getUsername(), userInfo.getUsername(),
userInfo.getEmail(), userInfo.getEmail(),
userInfo.getActive(), userInfo.getActive(),
userInfo.getLocale(), userInfo.getLanguage(),
userInfo.getTimeZone(), userInfo.getTimeZone(),
userInfo.roles); userInfo.roles);
} }

26
src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserMod.java
View file

@ -13,6 +13,7 @@ import java.util.Locale;
import java.util.Set; import java.util.Set;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
@ -57,9 +58,9 @@ public final class UserMod implements UserAccount {
public final String email; public final String email;
/** The users locale */ /** The users locale */
@NotNull(message = "user:locale:notNull") @NotNull(message = "user:language:notNull")
@JsonProperty(USER.ATTR_LOCALE) @JsonProperty(USER.ATTR_LANGUAGE)
public final Locale locale; public final Locale language;
/** The users time zone */ /** The users time zone */
@NotNull(message = "user:timeZone:notNull") @NotNull(message = "user:timeZone:notNull")
@ -67,6 +68,8 @@ public final class UserMod implements UserAccount {
public final DateTimeZone timeZone; public final DateTimeZone timeZone;
/** The users roles in a unmodifiable set */ /** The users roles in a unmodifiable set */
@NotNull(message = "user:userRoles:notNull")
@NotEmpty(message = "user:userRoles:notNull")
@JsonProperty(USER_ROLE.REFERENCE_NAME) @JsonProperty(USER_ROLE.REFERENCE_NAME)
public final Set<String> roles; public final Set<String> roles;
@ -89,7 +92,7 @@ public final class UserMod implements UserAccount {
@JsonProperty(PasswordChange.ATTR_NAME_NEW_PASSWORD) final String newPassword, @JsonProperty(PasswordChange.ATTR_NAME_NEW_PASSWORD) final String newPassword,
@JsonProperty(PasswordChange.ATTR_NAME_RETYPED_NEW_PASSWORD) final String retypedNewPassword, @JsonProperty(PasswordChange.ATTR_NAME_RETYPED_NEW_PASSWORD) final String retypedNewPassword,
@JsonProperty(USER.ATTR_EMAIL) final String email, @JsonProperty(USER.ATTR_EMAIL) final String email,
@JsonProperty(USER.ATTR_LOCALE) final Locale locale, @JsonProperty(USER.ATTR_LANGUAGE) final Locale language,
@JsonProperty(USER.ATTR_TIMEZONE) final DateTimeZone timeZone, @JsonProperty(USER.ATTR_TIMEZONE) final DateTimeZone timeZone,
@JsonProperty(USER_ROLE.REFERENCE_NAME) final Set<String> roles) { @JsonProperty(USER_ROLE.REFERENCE_NAME) final Set<String> roles) {
@ -100,7 +103,7 @@ public final class UserMod implements UserAccount {
this.name = name; this.name = name;
this.username = username; this.username = username;
this.email = email; this.email = email;
this.locale = (locale != null) ? locale : Locale.ROOT; this.language = (language != null) ? language : Locale.ENGLISH;
this.timeZone = (timeZone != null) ? timeZone : DateTimeZone.UTC; this.timeZone = (timeZone != null) ? timeZone : DateTimeZone.UTC;
this.roles = (roles != null) this.roles = (roles != null)
? Collections.unmodifiableSet(roles) ? Collections.unmodifiableSet(roles)
@ -115,7 +118,7 @@ public final class UserMod implements UserAccount {
this.name = userInfo.name; this.name = userInfo.name;
this.username = userInfo.username; this.username = userInfo.username;
this.email = userInfo.email; this.email = userInfo.email;
this.locale = userInfo.locale; this.language = userInfo.language;
this.timeZone = userInfo.timeZone; this.timeZone = userInfo.timeZone;
this.roles = userInfo.roles; this.roles = userInfo.roles;
} }
@ -128,7 +131,7 @@ public final class UserMod implements UserAccount {
this.name = postAttrMapper.getString(USER.ATTR_NAME); this.name = postAttrMapper.getString(USER.ATTR_NAME);
this.username = postAttrMapper.getString(USER.ATTR_USERNAME); this.username = postAttrMapper.getString(USER.ATTR_USERNAME);
this.email = postAttrMapper.getString(USER.ATTR_EMAIL); this.email = postAttrMapper.getString(USER.ATTR_EMAIL);
this.locale = postAttrMapper.getLocale(USER.ATTR_LOCALE); this.language = postAttrMapper.getLocale(USER.ATTR_LANGUAGE);
this.timeZone = postAttrMapper.getDateTimeZone(USER.ATTR_TIMEZONE); this.timeZone = postAttrMapper.getDateTimeZone(USER.ATTR_TIMEZONE);
this.roles = postAttrMapper.getStringSet(USER_ROLE.REFERENCE_NAME); this.roles = postAttrMapper.getStringSet(USER_ROLE.REFERENCE_NAME);
} }
@ -141,7 +144,7 @@ public final class UserMod implements UserAccount {
this.name = null; this.name = null;
this.username = null; this.username = null;
this.email = null; this.email = null;
this.locale = Locale.ENGLISH; this.language = Locale.ENGLISH;
this.timeZone = DateTimeZone.UTC; this.timeZone = DateTimeZone.UTC;
this.roles = Collections.emptySet(); this.roles = Collections.emptySet();
} }
@ -187,8 +190,8 @@ public final class UserMod implements UserAccount {
} }
@Override @Override
public Locale getLocale() { public Locale getLanguage() {
return this.locale; return this.language;
} }
@Override @Override
@ -237,7 +240,8 @@ public final class UserMod implements UserAccount {
public String toString() { public String toString() {
return "UserMod [uuid=" + this.uuid + ", institutionId=" + this.institutionId + ", name=" + this.name return "UserMod [uuid=" + this.uuid + ", institutionId=" + this.institutionId + ", name=" + this.name
+ ", username=" + ", username="
+ this.username + ", email=" + this.email + ", locale=" + this.locale + ", timeZone=" + this.timeZone + this.username + ", email=" + this.email + ", language=" + this.language + ", timeZone="
+ this.timeZone
+ ", roles=" + this.roles + ", roles=" + this.roles
+ ", newPassword=" + this.newPassword + ", retypedNewPassword=" + this.retypedNewPassword + "]"; + ", newPassword=" + this.newPassword + ", retypedNewPassword=" + this.retypedNewPassword + "]";
} }

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

@ -29,7 +29,6 @@ import ch.ethz.seb.sebserver.gui.form.FormHandle;
import ch.ethz.seb.sebserver.gui.form.PageFormService; import ch.ethz.seb.sebserver.gui.form.PageFormService;
import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; 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.PageContext;
import ch.ethz.seb.sebserver.gui.service.page.PageContext.AttributeKeys;
import ch.ethz.seb.sebserver.gui.service.page.PageUtils; import ch.ethz.seb.sebserver.gui.service.page.PageUtils;
import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService;
@ -65,7 +64,7 @@ public class InstitutionForm implements TemplateComposer {
final WidgetFactory widgetFactory = this.pageFormService.getWidgetFactory(); final WidgetFactory widgetFactory = this.pageFormService.getWidgetFactory();
final EntityKey entityKey = pageContext.getEntityKey(); final EntityKey entityKey = pageContext.getEntityKey();
final boolean isNew = entityKey == null;
// get data or create new. Handle error if happen // get data or create new. Handle error if happen
final Institution institution = (entityKey == null) final Institution institution = (entityKey == null)
? new Institution(null, null, null, null, false) ? new Institution(null, null, null, null, false)
@ -82,6 +81,11 @@ public class InstitutionForm implements TemplateComposer {
return; return;
} }
final boolean writeGrant = this.currentUser.hasPrivilege(PrivilegeType.WRITE, institution);
final boolean modifyGrant = this.currentUser.hasPrivilege(PrivilegeType.MODIFY, institution);
final boolean userWriteGrant = this.currentUser.hasPrivilege(PrivilegeType.WRITE, EntityType.USER);
final boolean isReadonly = pageContext.isReadonly();
// new PageContext with actual EntityKey // new PageContext with actual EntityKey
final PageContext formContext = pageContext; final PageContext formContext = pageContext;
pageContext.withEntityKey(institution.getEntityKey()); pageContext.withEntityKey(institution.getEntityKey());
@ -92,9 +96,9 @@ public class InstitutionForm implements TemplateComposer {
// the default page layout with interactive title // the default page layout with interactive title
final LocTextKey titleKey = new LocTextKey( final LocTextKey titleKey = new LocTextKey(
(entityKey != null) (isNew)
? "sebserver.institution.form.title" ? "sebserver.institution.form.title.new"
: "sebserver.institution.form.title.new", : "sebserver.institution.form.title",
institution.name); institution.name);
final Composite content = widgetFactory.defaultPageLayout( final Composite content = widgetFactory.defaultPageLayout(
formContext.getParent(), formContext.getParent(),
@ -103,8 +107,8 @@ public class InstitutionForm implements TemplateComposer {
// The Institution form // The Institution form
final FormHandle<Institution> formHandle = this.pageFormService.getBuilder( final FormHandle<Institution> formHandle = this.pageFormService.getBuilder(
formContext.copyOf(content), 4) formContext.copyOf(content), 4)
.readonly(pageContext.isReadonly()) .readonly(formContext.isReadonly())
.putStaticValueIf(() -> entityKey != null, .putStaticValueIf(() -> !isNew,
Domain.INSTITUTION.ATTR_ID, Domain.INSTITUTION.ATTR_ID,
institution.getModelId()) institution.getModelId())
.addField(FormBuilder.text( .addField(FormBuilder.text(
@ -119,47 +123,42 @@ public class InstitutionForm implements TemplateComposer {
Domain.INSTITUTION.ATTR_LOGO_IMAGE, Domain.INSTITUTION.ATTR_LOGO_IMAGE,
"sebserver.institution.form.logoImage", "sebserver.institution.form.logoImage",
institution.logoImage) institution.logoImage)
.withCondition(() -> entityKey != null)) .withCondition(() -> !isNew && modifyGrant))
.buildFor((entityKey == null) .buildFor((isNew)
? this.restService.getRestCall(NewInstitution.class) ? this.restService.getRestCall(NewInstitution.class)
: this.restService.getRestCall(SaveInstitution.class)); : this.restService.getRestCall(SaveInstitution.class));
// propagate content actions to action-pane // propagate content actions to action-pane
final boolean writeGrant = this.currentUser.hasPrivilege(PrivilegeType.WRITE, institution);
final boolean modifyGrant = this.currentUser.hasPrivilege(PrivilegeType.MODIFY, institution);
if (pageContext.isReadonly()) {
formContext.createAction(ActionDefinition.INSTITUTION_NEW) formContext.createAction(ActionDefinition.INSTITUTION_NEW)
.withAttribute(AttributeKeys.READ_ONLY, "false") .readonly(false)
.publishIf(() -> writeGrant); .publishIf(() -> writeGrant && isReadonly)
formContext.createAction(ActionDefinition.INSTITUTION_MODIFY)
.withExec(InstitutionActions::editInstitution)
.publishIf(() -> modifyGrant);
if (!institution.isActive()) {
formContext.createAction(ActionDefinition.INSTITUTION_ACTIVATE)
.withExec(InstitutionActions::activateInstitution)
.publishIf(() -> modifyGrant);
} else {
formContext.createAction(ActionDefinition.INSTITUTION_DEACTIVATE)
.withExec(InstitutionActions::deactivateInstitution)
.withConfirm(PageUtils.confirmDeactivation(institution, this.restService))
.publishIf(() -> modifyGrant)
.withParentEntityKey(entityKey)
.createAction(ActionDefinition.USER_ACCOUNT_NEW) .createAction(ActionDefinition.USER_ACCOUNT_NEW)
.withExec(UserAccountActions::newUserAccount) .withExec(UserAccountActions::newUserAccount)
.withParentEntity(institution.getEntityKey()) .resetEntity()
.publishIf(() -> this.currentUser.hasPrivilege(PrivilegeType.WRITE, EntityType.USER)); .withParentEntity(entityKey)
} .publishIf(() -> userWriteGrant && isReadonly && institution.isActive())
} else { .createAction(ActionDefinition.INSTITUTION_MODIFY)
formContext.createAction(ActionDefinition.INSTITUTION_SAVE) .withExec(InstitutionActions::editInstitution)
.publishIf(() -> modifyGrant && isReadonly)
.createAction(ActionDefinition.INSTITUTION_DEACTIVATE)
.withExec(InstitutionActions::deactivateInstitution)
.withConfirm(PageUtils.confirmDeactivation(institution, this.restService))
.publishIf(() -> writeGrant && isReadonly && institution.isActive())
.createAction(ActionDefinition.INSTITUTION_ACTIVATE)
.withExec(InstitutionActions::activateInstitution)
.publishIf(() -> writeGrant && isReadonly && !institution.isActive())
.createAction(ActionDefinition.INSTITUTION_SAVE)
.withExec(formHandle::postChanges) .withExec(formHandle::postChanges)
.publish() .publishIf(() -> !isReadonly)
.createAction(ActionDefinition.INSTITUTION_CANCEL_MODIFY) .createAction(ActionDefinition.INSTITUTION_CANCEL_MODIFY)
.withExec(InstitutionActions::cancelEditInstitution) .withExec(InstitutionActions::cancelEditInstitution)
.withConfirm("sebserver.overall.action.modify.cancel.confirm") .withConfirm("sebserver.overall.action.modify.cancel.confirm")
.publish(); .publishIf(() -> !isReadonly);
}
} }
} }

8
src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java
View file

@ -80,6 +80,9 @@ public class InstitutionList implements TemplateComposer {
pageContext.createAction(ActionDefinition.INSTITUTION_NEW) pageContext.createAction(ActionDefinition.INSTITUTION_NEW)
.readonly(false) .readonly(false)
.publishIf(() -> this.currentUser.hasPrivilege(PrivilegeType.WRITE, EntityType.INSTITUTION)) .publishIf(() -> this.currentUser.hasPrivilege(PrivilegeType.WRITE, EntityType.INSTITUTION))
.createAction(ActionDefinition.USER_ACCOUNT_NEW)
.withExec(UserAccountActions::newUserAccount)
.publishIf(() -> this.currentUser.hasPrivilege(PrivilegeType.WRITE, EntityType.USER))
.createAction(ActionDefinition.INSTITUTION_VIEW_FROM_LIST) .createAction(ActionDefinition.INSTITUTION_VIEW_FROM_LIST)
.withSelectionSupplier(table::getSelection) .withSelectionSupplier(table::getSelection)
.withExec(InstitutionActions::viewInstitutionFromList) .withExec(InstitutionActions::viewInstitutionFromList)
@ -88,10 +91,7 @@ public class InstitutionList implements TemplateComposer {
.withSelectionSupplier(table::getSelection) .withSelectionSupplier(table::getSelection)
.withExec(InstitutionActions::editInstitutionFromList) .withExec(InstitutionActions::editInstitutionFromList)
.readonly(false) .readonly(false)
.publishIf(() -> this.currentUser.hasPrivilege(PrivilegeType.MODIFY, EntityType.INSTITUTION)) .publishIf(() -> this.currentUser.hasPrivilege(PrivilegeType.MODIFY, EntityType.INSTITUTION));
.createAction(ActionDefinition.USER_ACCOUNT_NEW)
.withExec(UserAccountActions::newUserAccount)
.publishIf(() -> this.currentUser.hasPrivilege(PrivilegeType.WRITE, EntityType.USER));
; ;
} }

4
src/main/java/ch/ethz/seb/sebserver/gui/content/LoginPage.java
View file

@ -96,7 +96,7 @@ public class LoginPage implements TemplateComposer {
this.i18nSupport.setSessionLocale( this.i18nSupport.setSessionLocale(
authorizationContext authorizationContext
.getLoggedInUser() .getLoggedInUser()
.get(pageContext::logoutOnError).locale); .getOrThrow().language);
pageContext.forwardToMainPage(pageContext); pageContext.forwardToMainPage(pageContext);
@ -125,13 +125,13 @@ public class LoginPage implements TemplateComposer {
final PageContext pageContext, final PageContext pageContext,
final String message) { final String message) {
pageContext.logout();
final MessageBox error = new Message( final MessageBox error = new Message(
pageContext.getShell(), pageContext.getShell(),
this.i18nSupport.getText("sebserver.login.failed.title"), this.i18nSupport.getText("sebserver.login.failed.title"),
this.i18nSupport.getText(message, message), this.i18nSupport.getText(message, message),
SWT.ERROR); SWT.ERROR);
error.open(null); error.open(null);
pageContext.logoutOnError(new RuntimeException(message));
} }
} }

34
src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountChangePasswordForm.java
View file

@ -8,7 +8,9 @@
package ch.ethz.seb.sebserver.gui.content; package ch.ethz.seb.sebserver.gui.content;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.MessageBox;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -23,12 +25,15 @@ import ch.ethz.seb.sebserver.gui.content.action.UserAccountActions;
import ch.ethz.seb.sebserver.gui.form.FormBuilder; import ch.ethz.seb.sebserver.gui.form.FormBuilder;
import ch.ethz.seb.sebserver.gui.form.FormHandle; import ch.ethz.seb.sebserver.gui.form.FormHandle;
import ch.ethz.seb.sebserver.gui.form.PageFormService; import ch.ethz.seb.sebserver.gui.form.PageFormService;
import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport;
import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey;
import ch.ethz.seb.sebserver.gui.service.page.PageContext; import ch.ethz.seb.sebserver.gui.service.page.PageContext;
import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.ChangePassword; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.ChangePassword;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.GetUserAccount; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.GetUserAccount;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser;
import ch.ethz.seb.sebserver.gui.widget.Message;
import ch.ethz.seb.sebserver.gui.widget.WidgetFactory; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory;
@Lazy @Lazy
@ -38,13 +43,19 @@ public class UserAccountChangePasswordForm implements TemplateComposer {
private final PageFormService pageFormService; private final PageFormService pageFormService;
private final RestService restService; private final RestService restService;
private final CurrentUser currentUser;
private final I18nSupport i18nSupport;
protected UserAccountChangePasswordForm( protected UserAccountChangePasswordForm(
final PageFormService pageFormService, final PageFormService pageFormService,
final RestService restService) { final RestService restService,
final CurrentUser currentUser,
final I18nSupport i18nSupport) {
this.pageFormService = pageFormService; this.pageFormService = pageFormService;
this.restService = restService; this.restService = restService;
this.currentUser = currentUser;
this.i18nSupport = i18nSupport;
} }
@Override @Override
@ -66,9 +77,9 @@ public class UserAccountChangePasswordForm implements TemplateComposer {
// The Password Change form // The Password Change form
final FormHandle<UserInfo> formHandle = this.pageFormService.getBuilder( final FormHandle<UserInfo> formHandle = this.pageFormService.getBuilder(
pageContext.copyOf(content), 4) pageContext.copyOf(content), 4)
.readonly(pageContext.isReadonly()) .readonly(false)
.putStaticValueIf(() -> entityKey != null, .putStaticValueIf(() -> entityKey != null,
Domain.USER.ATTR_ID, Domain.USER.ATTR_UUID,
entityKey.getModelId()) entityKey.getModelId())
.addField(FormBuilder.text( .addField(FormBuilder.text(
PasswordChange.ATTR_NAME_OLD_PASSWORD, PasswordChange.ATTR_NAME_OLD_PASSWORD,
@ -86,7 +97,22 @@ public class UserAccountChangePasswordForm implements TemplateComposer {
.buildFor(this.restService.getRestCall(ChangePassword.class)); .buildFor(this.restService.getRestCall(ChangePassword.class));
pageContext.createAction(ActionDefinition.USER_ACCOUNT_CHANGE_PASSOWRD_SAVE) pageContext.createAction(ActionDefinition.USER_ACCOUNT_CHANGE_PASSOWRD_SAVE)
.withExec(formHandle::postChanges) .withExec(action -> {
formHandle.postChanges(action);
if (this.currentUser.get().uuid.equals(entityKey.getModelId())) {
// NOTE: in this case the user changed the password of the own account
// this should cause an logout with specified message that password change
// was successful and the pointing the need of re login with the new password
pageContext.logout();
final MessageBox error = new Message(
pageContext.getShell(),
this.i18nSupport.getText("sebserver.login.password.change"),
this.i18nSupport.getText("sebserver.login.password.change.success"),
SWT.ERROR);
error.open(null);
}
return null;
})
.publish() .publish()
.createAction(ActionDefinition.USER_ACCOUNT_CANCEL_MODIFY) .createAction(ActionDefinition.USER_ACCOUNT_CANCEL_MODIFY)
.withExec(UserAccountActions::cancelEditUserAccount) .withExec(UserAccountActions::cancelEditUserAccount)

86
src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountForm.java
View file

@ -20,12 +20,10 @@ import org.springframework.stereotype.Component;
import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.api.API; 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.authorization.PrivilegeType;
import ch.ethz.seb.sebserver.gbl.model.Domain; import ch.ethz.seb.sebserver.gbl.model.Domain;
import ch.ethz.seb.sebserver.gbl.model.Domain.USER_ROLE; import ch.ethz.seb.sebserver.gbl.model.Domain.USER_ROLE;
import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.institution.Institution;
import ch.ethz.seb.sebserver.gbl.model.user.PasswordChange; import ch.ethz.seb.sebserver.gbl.model.user.PasswordChange;
import ch.ethz.seb.sebserver.gbl.model.user.UserAccount; import ch.ethz.seb.sebserver.gbl.model.user.UserAccount;
import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
@ -79,12 +77,14 @@ public class UserAccountForm implements TemplateComposer {
final BooleanSupplier isNew = () -> entityKey == null; final BooleanSupplier isNew = () -> entityKey == null;
final BooleanSupplier isNotNew = () -> !isNew.getAsBoolean(); final BooleanSupplier isNotNew = () -> !isNew.getAsBoolean();
final BooleanSupplier isSEBAdmin = () -> this.currentUser.get().hasRole(UserRole.SEB_SERVER_ADMIN); final BooleanSupplier isSEBAdmin = () -> this.currentUser.get().hasRole(UserRole.SEB_SERVER_ADMIN);
final boolean readonly = pageContext.isReadonly();
// get data or create new. handle error if happen // get data or create new. handle error if happen
final UserAccount userAccount = isNew.getAsBoolean() final UserAccount userAccount = isNew.getAsBoolean()
? new UserMod( ? new UserMod(
UUID.randomUUID().toString(), UUID.randomUUID().toString(),
this.currentUser.get().institutionId) (parentEntityKey != null)
? Long.valueOf(parentEntityKey.modelId)
: this.currentUser.get().institutionId)
: this.restService : this.restService
.getBuilder(GetUserAccount.class) .getBuilder(GetUserAccount.class)
.withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId) .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId)
@ -99,6 +99,15 @@ public class UserAccountForm implements TemplateComposer {
return; return;
} }
final boolean writeGrant = this.currentUser.hasPrivilege(PrivilegeType.WRITE, userAccount);
final boolean modifyGrant = this.currentUser.hasPrivilege(PrivilegeType.MODIFY, userAccount);
// modifying an UserAccount is not possible if the root institution is inactive
final boolean istitutionActive = this.restService.getBuilder(GetInstitution.class)
.withURIVariable(API.PARAM_MODEL_ID, String.valueOf(userAccount.getInstitutionId()))
.call()
.map(inst -> inst.active)
.getOr(false);
// new PageContext with actual EntityKey // new PageContext with actual EntityKey
final PageContext formContext = pageContext; final PageContext formContext = pageContext;
pageContext.withEntityKey(userAccount.getEntityKey()); pageContext.withEntityKey(userAccount.getEntityKey());
@ -120,16 +129,17 @@ public class UserAccountForm implements TemplateComposer {
// The UserAccount form // The UserAccount form
final FormHandle<UserInfo> formHandle = this.pageFormService.getBuilder( final FormHandle<UserInfo> formHandle = this.pageFormService.getBuilder(
formContext.copyOf(content), 4) formContext.copyOf(content), 4)
.readonly(pageContext.isReadonly()) .readonly(readonly)
.putStaticValueIf(isNotNew, .putStaticValueIf(isNotNew,
Domain.USER.ATTR_UUID, Domain.USER.ATTR_UUID,
userAccount.getModelId()) userAccount.getModelId())
.putStaticValueIf(isNotNew,
Domain.USER.ATTR_INSTITUTION_ID,
String.valueOf(userAccount.getInstitutionId()))
.addField(FormBuilder.singleSelection( .addField(FormBuilder.singleSelection(
Domain.USER.ATTR_INSTITUTION_ID, Domain.USER.ATTR_INSTITUTION_ID,
"sebserver.useraccount.form.institution", "sebserver.useraccount.form.institution",
(parentEntityKey != null && parentEntityKey.entityType == EntityType.INSTITUTION) String.valueOf(userAccount.getInstitutionId()),
? parentEntityKey.modelId
: String.valueOf(userAccount.getInstitutionId()),
() -> PageUtils.getInstitutionSelectionResource(this.restService)) () -> PageUtils.getInstitutionSelectionResource(this.restService))
.withCondition(isSEBAdmin) .withCondition(isSEBAdmin)
.readonlyIf(isNotNew)) .readonlyIf(isNotNew))
@ -146,9 +156,9 @@ public class UserAccountForm implements TemplateComposer {
"sebserver.useraccount.form.mail", "sebserver.useraccount.form.mail",
userAccount.getEmail())) userAccount.getEmail()))
.addField(FormBuilder.singleSelection( .addField(FormBuilder.singleSelection(
Domain.USER.ATTR_LOCALE, Domain.USER.ATTR_LANGUAGE,
"sebserver.useraccount.form.language", "sebserver.useraccount.form.language",
userAccount.getLocale().getLanguage(), userAccount.getLanguage().getLanguage(),
widgetFactory.getI18nSupport().localizedLanguageResources())) widgetFactory.getI18nSupport().localizedLanguageResources()))
.addField(FormBuilder.singleSelection( .addField(FormBuilder.singleSelection(
Domain.USER.ATTR_TIMEZONE, Domain.USER.ATTR_TIMEZONE,
@ -159,7 +169,9 @@ public class UserAccountForm implements TemplateComposer {
USER_ROLE.REFERENCE_NAME, USER_ROLE.REFERENCE_NAME,
"sebserver.useraccount.form.roles", "sebserver.useraccount.form.roles",
StringUtils.join(userAccount.getRoles(), Constants.LIST_SEPARATOR_CHAR), StringUtils.join(userAccount.getRoles(), Constants.LIST_SEPARATOR_CHAR),
widgetFactory.getI18nSupport().localizedUserRoleResources())) widgetFactory.getI18nSupport().localizedUserRoleResources())
.withCondition(() -> modifyGrant)
.visibleIf(writeGrant))
.addField(FormBuilder.text( .addField(FormBuilder.text(
PasswordChange.ATTR_NAME_NEW_PASSWORD, PasswordChange.ATTR_NAME_NEW_PASSWORD,
"sebserver.useraccount.form.password") "sebserver.useraccount.form.password")
@ -175,48 +187,36 @@ public class UserAccountForm implements TemplateComposer {
: this.restService.getRestCall(SaveUserAccount.class)); : this.restService.getRestCall(SaveUserAccount.class));
// propagate content actions to action-pane // propagate content actions to action-pane
final boolean writeGrant = this.currentUser.hasPrivilege(PrivilegeType.WRITE, userAccount);
final boolean modifyGrant = this.currentUser.hasPrivilege(PrivilegeType.MODIFY, userAccount);
if (pageContext.isReadonly()) {
formContext.createAction(ActionDefinition.USER_ACCOUNT_CHANGE_PASSOWRD)
.withEntity(userAccount.getEntityKey())
.publishIf(() -> writeGrant);
// modifying an UserAccount is not possible if the root institution is inactive
final Institution inst = this.restService.getBuilder(GetInstitution.class)
.withURIVariable(API.PARAM_MODEL_ID, String.valueOf(userAccount.getInstitutionId()))
.call()
.getOrThrow();
if (inst.isActive()) {
formContext.createAction(ActionDefinition.USER_ACCOUNT_NEW) formContext.createAction(ActionDefinition.USER_ACCOUNT_NEW)
.withExec(UserAccountActions::newUserAccount) .withExec(UserAccountActions::newUserAccount)
.publishIf(() -> writeGrant); .publishIf(() -> writeGrant && readonly && istitutionActive)
formContext.createAction(ActionDefinition.USER_ACCOUNT_MODIFY)
.withExec(UserAccountActions::editUserAccount)
.publishIf(() -> modifyGrant);
if (!userAccount.isActive()) { .createAction(ActionDefinition.USER_ACCOUNT_MODIFY)
formContext.createAction(ActionDefinition.USER_ACCOUNT_ACTIVATE) .withExec(UserAccountActions::editUserAccount)
.withExec(UserAccountActions::activateUserAccount) .publishIf(() -> modifyGrant && readonly && istitutionActive)
.publishIf(() -> modifyGrant);
} else { .createAction(ActionDefinition.USER_ACCOUNT_CHANGE_PASSOWRD)
formContext.createAction(ActionDefinition.USER_ACCOUNT_DEACTIVATE) .withEntity(userAccount.getEntityKey())
.publishIf(() -> modifyGrant && readonly && istitutionActive && userAccount.isActive())
.createAction(ActionDefinition.USER_ACCOUNT_DEACTIVATE)
.withExec(UserAccountActions::deactivateUserAccount) .withExec(UserAccountActions::deactivateUserAccount)
.withConfirm(PageUtils.confirmDeactivation(userAccount, this.restService)) .withConfirm(PageUtils.confirmDeactivation(userAccount, this.restService))
.publishIf(() -> modifyGrant); .publishIf(() -> writeGrant && readonly && istitutionActive && userAccount.isActive())
}
} .createAction(ActionDefinition.USER_ACCOUNT_ACTIVATE)
} else { .withExec(UserAccountActions::activateUserAccount)
formContext.createAction(ActionDefinition.USER_ACCOUNT_SAVE) .publishIf(() -> writeGrant && readonly && istitutionActive && !userAccount.isActive())
.createAction(ActionDefinition.USER_ACCOUNT_SAVE)
.withExec(formHandle::postChanges) .withExec(formHandle::postChanges)
.publish() .publishIf(() -> !readonly)
.createAction(ActionDefinition.USER_ACCOUNT_CANCEL_MODIFY) .createAction(ActionDefinition.USER_ACCOUNT_CANCEL_MODIFY)
.withExec(UserAccountActions::cancelEditUserAccount) .withExec(UserAccountActions::cancelEditUserAccount)
.withConfirm("sebserver.overall.action.modify.cancel.confirm") .withConfirm("sebserver.overall.action.modify.cancel.confirm")
.publish(); .publishIf(() -> !readonly);
}
} }
} }

8
src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java
View file

@ -84,10 +84,10 @@ public class UserAccountList implements TemplateComposer {
new TableFilterAttribute(CriteriaType.TEXT, Domain.USER.ATTR_EMAIL), new TableFilterAttribute(CriteriaType.TEXT, Domain.USER.ATTR_EMAIL),
true)) true))
.withColumn(new ColumnDefinition<>( .withColumn(new ColumnDefinition<>(
Domain.USER.ATTR_LOCALE, Domain.USER.ATTR_LANGUAGE,
new LocTextKey("sebserver.useraccount.list.column.language"), new LocTextKey("sebserver.useraccount.list.column.language"),
this::getLocaleDisplayText, this::getLocaleDisplayText,
new TableFilterAttribute(CriteriaType.COUNTRY_SELECTION, Domain.USER.ATTR_LOCALE), new TableFilterAttribute(CriteriaType.COUNTRY_SELECTION, Domain.USER.ATTR_LANGUAGE),
true, true)) true, true))
.withColumn(new ColumnDefinition<>( .withColumn(new ColumnDefinition<>(
Domain.USER.ATTR_ACTIVE, Domain.USER.ATTR_ACTIVE,
@ -111,8 +111,8 @@ public class UserAccountList implements TemplateComposer {
} }
private String getLocaleDisplayText(final UserInfo userInfo) { private String getLocaleDisplayText(final UserInfo userInfo) {
return (userInfo.locale != null) return (userInfo.language != null)
? userInfo.locale.getDisplayLanguage(this.widgetFactory.getI18nSupport().getCurrentLocale()) ? userInfo.language.getDisplayLanguage(this.widgetFactory.getI18nSupport().getCurrentLocale())
: null; : null;
} }

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

@ -84,7 +84,7 @@ public enum ActionDefinition {
UserAccountList.class), UserAccountList.class),
USER_ACCOUNT_VIEW_FORM( USER_ACCOUNT_VIEW_FORM(
new LocTextKey("sebserver.useraccount.action.form"), new LocTextKey("sebserver.useraccount.action.form"),
InstitutionForm.class, UserAccountForm.class,
USER_ACCOUNT_VIEW_LIST), USER_ACCOUNT_VIEW_LIST),
USER_ACCOUNT_NEW( USER_ACCOUNT_NEW(
new LocTextKey("sebserver.useraccount.action.new"), new LocTextKey("sebserver.useraccount.action.new"),

6
src/main/java/ch/ethz/seb/sebserver/gui/form/FieldBuilder.java
View file

@ -18,6 +18,7 @@ public abstract class FieldBuilder {
String group = null; String group = null;
BooleanSupplier condition = null; BooleanSupplier condition = null;
boolean readonly = false; boolean readonly = false;
boolean visible = true;
final String name; final String name;
final String label; final String label;
@ -64,6 +65,11 @@ public abstract class FieldBuilder {
return this; return this;
} }
public FieldBuilder visibleIf(final boolean visible) {
this.visible = visible;
return this;
}
public FieldBuilder readonlyIf(final BooleanSupplier readonly) { public FieldBuilder readonlyIf(final BooleanSupplier readonly) {
this.readonly = readonly != null && readonly.getAsBoolean(); this.readonly = readonly != null && readonly.getAsBoolean();
return this; return this;

47
src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java
View file

@ -16,7 +16,6 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.RWT;
@ -87,17 +86,6 @@ public final class Form implements FormBinding {
return buffer.toString(); return buffer.toString();
} }
public List<String> getValue(final String name) {
if (this.formFields.containsKey(name)) {
return this.formFields
.get(name)
.stream()
.map(ffa -> ffa.getValue())
.collect(Collectors.toList());
}
return null;
}
public void putStatic(final String name, final String value) { public void putStatic(final String name, final String value) {
if (StringUtils.isNoneBlank(value)) { if (StringUtils.isNoneBlank(value)) {
this.staticValues.put(name, value); this.staticValues.put(name, value);
@ -176,6 +164,13 @@ public final class Form implements FormBinding {
ffa -> ffa.setVisible(visible)); ffa -> ffa.setVisible(visible));
} }
public void setFieldVisible(final boolean visible, final String fieldName) {
final List<FormFieldAccessor> list = this.formFields.get(fieldName);
if (list != null) {
list.stream().forEach(ffa -> ffa.setVisible(visible));
}
}
public void process( public void process(
final Predicate<String> nameFilter, final Predicate<String> nameFilter,
final Consumer<FormFieldAccessor> processor) { final Consumer<FormFieldAccessor> processor) {
@ -189,13 +184,17 @@ public final class Form implements FormBinding {
private void flush() { private void flush() {
for (final Map.Entry<String, String> entry : this.staticValues.entrySet()) { for (final Map.Entry<String, String> entry : this.staticValues.entrySet()) {
this.objectRoot.put(entry.getKey(), entry.getValue()); final String value = entry.getValue();
if (StringUtils.isNoneBlank(value)) {
this.objectRoot.put(entry.getKey(), value);
}
} }
for (final Map.Entry<String, List<FormFieldAccessor>> entry : this.formFields.entrySet()) { for (final Map.Entry<String, List<FormFieldAccessor>> entry : this.formFields.entrySet()) {
entry.getValue() entry.getValue()
.stream() .stream()
.forEach(ffa -> this.objectRoot.put(entry.getKey(), ffa.getValue())); .filter(ffa -> StringUtils.isNoneBlank(ffa.getValue()))
.forEach(ffa -> ffa.putJsonValue(entry.getKey(), this.objectRoot));
} }
for (final Map.Entry<String, Form> entry : this.subForms.entrySet()) { for (final Map.Entry<String, Form> entry : this.subForms.entrySet()) {
@ -220,7 +219,7 @@ public final class Form implements FormBinding {
//@formatter:off //@formatter:off
private FormFieldAccessor createAccessor(final Label label, final Label field) { private FormFieldAccessor createAccessor(final Label label, final Label field) {
return new FormFieldAccessor(label, field) { return new FormFieldAccessor(label, field) {
@Override public String getValue() { return field.getText(); } @Override public String getValue() { return null; }
@Override public void setValue(final String value) { field.setText(value); } @Override public void setValue(final String value) { field.setText(value); }
}; };
} }
@ -246,6 +245,17 @@ public final class Form implements FormBinding {
return new FormFieldAccessor(label, multiSelection) { return new FormFieldAccessor(label, multiSelection) {
@Override public String getValue() { return multiSelection.getSelectionValue(); } @Override public String getValue() { return multiSelection.getSelectionValue(); }
@Override public void setValue(final String value) { multiSelection.select(value); } @Override public void setValue(final String value) { multiSelection.select(value); }
@Override
public void putJsonValue(final String key, final ObjectNode objectRoot) {
final String value = getValue();
if (StringUtils.isNoneBlank(value)) {
final ArrayNode arrayNode = objectRoot.putArray(key);
final String[] split = StringUtils.split(value, Constants.LIST_SEPARATOR);
for (int i = 0; i < split.length; i++) {
arrayNode.add(split[i]);
}
}
}
}; };
} }
private FormFieldAccessor createAccessor(final Label label, final ImageUpload imageUpload) { private FormFieldAccessor createAccessor(final Label label, final ImageUpload imageUpload) {
@ -297,6 +307,13 @@ public final class Form implements FormBinding {
this.control.setVisible(visible); this.control.setVisible(visible);
} }
public void putJsonValue(final String key, final ObjectNode objectRoot) {
final String value = getValue();
if (StringUtils.isNoneBlank(value)) {
objectRoot.put(key, value);
}
}
public void setError(final String errorTooltip) { public void setError(final String errorTooltip) {
if (!this.hasError) { if (!this.hasError) {
this.control.setData(RWT.CUSTOM_VARIANT, "error"); this.control.setData(RWT.CUSTOM_VARIANT, "error");

5
src/main/java/ch/ethz/seb/sebserver/gui/form/FormBuilder.java
View file

@ -82,6 +82,11 @@ public class FormBuilder {
return this; return this;
} }
public void setFieldVisible(final boolean visible, final String fieldName) {
this.form.setFieldVisible(visible, fieldName);
}
public FormBuilder setControl(final TabItem instTab) { public FormBuilder setControl(final TabItem instTab) {
instTab.setControl(this.formParent); instTab.setControl(this.formParent);
return this; return this;

1
src/main/java/ch/ethz/seb/sebserver/gui/form/ImageUploadFieldBuilder.java
View file

@ -32,6 +32,7 @@ public final class ImageUploadFieldBuilder extends FieldBuilder {
imageUpload.setLayoutData(gridData); imageUpload.setLayoutData(gridData);
imageUpload.setImageBase64(this.value); imageUpload.setImageBase64(this.value);
builder.form.putField(this.name, lab, imageUpload); builder.form.putField(this.name, lab, imageUpload);
builder.setFieldVisible(this.visible, this.name);
} }
} }

3
src/main/java/ch/ethz/seb/sebserver/gui/form/SelectionFieldBuilder.java
View file

@ -84,6 +84,7 @@ public final class SelectionFieldBuilder extends FieldBuilder {
this.selectionListener.accept(builder.form); this.selectionListener.accept(builder.form);
}); });
} }
builder.setFieldVisible(this.visible, this.name);
} }
/* Build the read-only representation of the selection field */ /* Build the read-only representation of the selection field */
@ -106,7 +107,6 @@ public final class SelectionFieldBuilder extends FieldBuilder {
.map(tuple -> tuple._2) .map(tuple -> tuple._2)
.forEach(v -> createMuliSelectionReadonlyLabel(composite, v)); .forEach(v -> createMuliSelectionReadonlyLabel(composite, v));
} }
} else { } else {
builder.form.putField( builder.form.putField(
this.name, lab, this.name, lab,
@ -118,6 +118,7 @@ public final class SelectionFieldBuilder extends FieldBuilder {
.map(tuple -> tuple._2) .map(tuple -> tuple._2)
.orElse(null), .orElse(null),
this.spanInput)); this.spanInput));
builder.setFieldVisible(this.visible, this.name);
} }
} }

2
src/main/java/ch/ethz/seb/sebserver/gui/form/TextFieldBuilder.java
View file

@ -36,6 +36,7 @@ public final class TextFieldBuilder extends FieldBuilder {
if (builder.readonly || this.readonly) { if (builder.readonly || this.readonly) {
builder.form.putField(this.name, lab, builder.form.putField(this.name, lab,
builder.valueLabel(builder.formParent, this.value, this.spanInput)); builder.valueLabel(builder.formParent, this.value, this.spanInput));
builder.setFieldVisible(this.visible, this.name);
} else { } else {
final Text textInput = new Text(builder.formParent, (this.isPassword) final Text textInput = new Text(builder.formParent, (this.isPassword)
? SWT.LEFT | SWT.BORDER | SWT.PASSWORD ? SWT.LEFT | SWT.BORDER | SWT.PASSWORD
@ -47,6 +48,7 @@ public final class TextFieldBuilder extends FieldBuilder {
textInput.setText(this.value); textInput.setText(this.value);
} }
builder.form.putField(this.name, lab, textInput); builder.form.putField(this.name, lab, textInput);
builder.setFieldVisible(this.visible, this.name);
} }
} }
} }

2
src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java
View file

@ -88,7 +88,7 @@ public class I18nSupportImpl implements I18nSupport {
// second user-locale if available // second user-locale if available
if (this.currentUser.isAvailable()) { if (this.currentUser.isAvailable()) {
return this.currentUser.get().locale; return this.currentUser.get().language;
} }
// last the default locale // last the default locale

35
src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageContext.java
View file

@ -10,6 +10,8 @@ package ch.ethz.seb.sebserver.gui.service.page;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ch.ethz.seb.sebserver.gbl.model.EntityKey; import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition; import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition;
@ -19,6 +21,8 @@ import ch.ethz.seb.sebserver.gui.service.page.event.PageEvent;
public interface PageContext { public interface PageContext {
Logger log = LoggerFactory.getLogger(PageContext.class);
public static final class PageAttr { public static final class PageAttr {
public final String name; public final String name;
@ -41,23 +45,6 @@ public interface PageContext {
public static final String ENTITY_TYPE = "ENTITY_TYPE"; public static final String ENTITY_TYPE = "ENTITY_TYPE";
public static final String PARENT_ENTITY_TYPE = "PARENT_ENTITY_TYPE"; public static final String PARENT_ENTITY_TYPE = "PARENT_ENTITY_TYPE";
// public static final String USER_NAME = "USER_NAME";
// public static final String PASSWORD = "PASSWORD";
//
//
// public static final String CONFIG_ID = "CONFIG_ID";
// public static final String CONFIG_VIEW_NAME = "CONFIG_VIEW_NAME";
// public static final String CONFIG_ATTRIBUTE_SAVE_TYPE = "CONFIG_ATTRIBUTE_SAVE_TYPE";
// public static final String CONFIG_ATTRIBUTE_VALUE = "CONFIG_ATTRIBUTE_VALUE";
//
// public static final String EXAM_ID = "EXAM_ID";
// public static final String STATE_NAME = "STATE_NAME";
//
// public static final String AUTHORIZATION_CONTEXT = "AUTHORIZATION_CONTEXT";
// public static final String AUTHORIZATION_HEADER = "AUTHORIZATION_HEADER";
// public static final String AUTHORIZATION_FAILURE = "AUTHORIZATION_FAILURE";
} }
ComposerService composerService(); ComposerService composerService();
@ -96,12 +83,6 @@ public interface PageContext {
* @return this PageContext instance (builder pattern) */ * @return this PageContext instance (builder pattern) */
PageContext withAttribute(String key, String value); PageContext withAttribute(String key, String value);
// default PageContext withSelection(final ActivitySelection selection) {
// return withSelection(selection, true);
// }
//
// PageContext withSelection(ActivitySelection selection, boolean clearAttributes);
String getAttribute(String name); String getAttribute(String name);
String getAttribute(String name, String def); String getAttribute(String name, String def);
@ -144,6 +125,8 @@ public interface PageContext {
void forwardToLoginPage(PageContext pageContext); void forwardToLoginPage(PageContext pageContext);
void logout();
/** Notify an error dialog to the user with specified error message and /** Notify an error dialog to the user with specified error message and
* optional exception instance * optional exception instance
* *
@ -153,7 +136,11 @@ public interface PageContext {
<T> T notifyError(Throwable error); <T> T notifyError(Throwable error);
<T> T logoutOnError(Throwable error); default <T> T logoutOnError(final Throwable t) {
log.error("Unexpected, Current User related error.Automatically logout and cleanup current user session. ", t);
logout();
return null;
}
void publishPageMessage(LocTextKey title, LocTextKey message); void publishPageMessage(LocTextKey title, LocTextKey message);

40
src/main/java/ch/ethz/seb/sebserver/gui/service/page/action/Action.java
View file

@ -40,6 +40,7 @@ public final class Action implements Runnable {
Supplier<Set<String>> selectionSupplier; Supplier<Set<String>> selectionSupplier;
private final PageContext originalPageContext;
private PageContext pageContext; private PageContext pageContext;
private Function<Action, Action> exec = Function.identity(); private Function<Action, Action> exec = Function.identity();
@ -49,6 +50,7 @@ public final class Action implements Runnable {
final RestService restService) { final RestService restService) {
this.definition = definition; this.definition = definition;
this.originalPageContext = pageContext;
this.pageContext = pageContext; this.pageContext = pageContext;
this.restService = restService; this.restService = restService;
} }
@ -70,14 +72,6 @@ public final class Action implements Runnable {
this.pageContext.publishPageEvent(new ActionEvent(this.exec.apply(this), false)); this.pageContext.publishPageEvent(new ActionEvent(this.exec.apply(this), false));
// this.exec.apply(this)
// .map(action -> {
// this.pageContext.publishPageEvent(
// new ActionEvent(action, false));
// return action;
// })
// .getOrThrow();
} catch (final PageMessageException pme) { } catch (final PageMessageException pme) {
Action.this.pageContext.publishPageMessage(pme); Action.this.pageContext.publishPageMessage(pme);
@ -130,6 +124,24 @@ public final class Action implements Runnable {
return this; return this;
} }
public Action resetEntity() {
this.pageContext = this.pageContext.withEntityKey(null);
return this;
}
public Action resetParentEntity() {
this.pageContext = this.pageContext.withParentEntityKey(null);
return this;
}
public EntityKey getEntityKey() {
return this.pageContext.getEntityKey();
}
public PageContext pageContext() {
return this.pageContext;
}
public Action withEntity(final EntityKey entityKey) { public Action withEntity(final EntityKey entityKey) {
this.pageContext = this.pageContext.withEntityKey(entityKey); this.pageContext = this.pageContext.withEntityKey(entityKey);
return this; return this;
@ -164,7 +176,7 @@ public final class Action implements Runnable {
public PageContext publish() { public PageContext publish() {
this.pageContext.publishPageEvent(new ActionPublishEvent(this)); this.pageContext.publishPageEvent(new ActionPublishEvent(this));
return this.pageContext; return this.originalPageContext;
} }
public PageContext publishIf(final BooleanSupplier condition) { public PageContext publishIf(final BooleanSupplier condition) {
@ -172,15 +184,7 @@ public final class Action implements Runnable {
publish(); publish();
} }
return this.pageContext; return this.originalPageContext;
}
public EntityKey getEntityKey() {
return this.pageContext.getEntityKey();
}
public PageContext pageContext() {
return this.pageContext;
} }
public Action readonly(final boolean b) { public Action readonly(final boolean b) {

5
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ComposerServiceImpl.java
View file

@ -103,6 +103,11 @@ public class ComposerServiceImpl implements ComposerService {
final String name, final String name,
final PageContext pageContext) { final PageContext pageContext) {
// Check first if there is still a valid authorization context
if (!this.authorizationContextHolder.getAuthorizationContext().isValid()) {
return;
}
if (!this.composer.containsKey(name)) { if (!this.composer.containsKey(name)) {
log.error("No TemplateComposer with name: " + name + " found. Check Spring confiuration and beans"); log.error("No TemplateComposer with name: " + name + " found. Check Spring confiuration and beans");
return; return;

11
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageContextImpl.java
View file

@ -203,7 +203,8 @@ public class PageContextImpl implements PageContext {
@Override @Override
public PageContext withEntityKey(final EntityKey entityKey) { public PageContext withEntityKey(final EntityKey entityKey) {
if (entityKey == null) { if (entityKey == null) {
return this; return removeAttribute(AttributeKeys.ENTITY_ID)
.removeAttribute(AttributeKeys.ENTITY_TYPE);
} }
return withAttribute(AttributeKeys.ENTITY_ID, entityKey.modelId) return withAttribute(AttributeKeys.ENTITY_ID, entityKey.modelId)
.withAttribute(AttributeKeys.ENTITY_TYPE, entityKey.entityType.name()); .withAttribute(AttributeKeys.ENTITY_TYPE, entityKey.entityType.name());
@ -211,6 +212,10 @@ public class PageContextImpl implements PageContext {
@Override @Override
public PageContext withParentEntityKey(final EntityKey entityKey) { public PageContext withParentEntityKey(final EntityKey entityKey) {
if (entityKey == null) {
return removeAttribute(AttributeKeys.PARENT_ENTITY_ID)
.removeAttribute(AttributeKeys.PARENT_ENTITY_TYPE);
}
return withAttribute(AttributeKeys.PARENT_ENTITY_ID, entityKey.modelId) return withAttribute(AttributeKeys.PARENT_ENTITY_ID, entityKey.modelId)
.withAttribute(AttributeKeys.PARENT_ENTITY_TYPE, entityKey.entityType.name()); .withAttribute(AttributeKeys.PARENT_ENTITY_TYPE, entityKey.entityType.name());
} }
@ -366,7 +371,7 @@ public class PageContextImpl implements PageContext {
} }
@Override @Override
public <T> T logoutOnError(final Throwable error) { public void logout() {
// just to be sure we leave a clean and proper authorizationContext // just to be sure we leave a clean and proper authorizationContext
try { try {
((ComposerServiceImpl) this.composerService).authorizationContextHolder ((ComposerServiceImpl) this.composerService).authorizationContextHolder
@ -378,8 +383,6 @@ public class PageContextImpl implements PageContext {
MainPageState.clear(); MainPageState.clear();
forwardToLoginPage(this); forwardToLoginPage(this);
return null;
} }
@Override @Override

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

@ -39,21 +39,20 @@ import ch.ethz.seb.sebserver.gui.widget.WidgetFactory;
import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.ImageIcon; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.ImageIcon;
import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService.SortOrder; import ch.ethz.seb.sebserver.webservice.servicelayer.PaginationService.SortOrder;
public class EntityTable<ROW extends Entity> extends Composite { public class EntityTable<ROW extends Entity> {
private static final long serialVersionUID = -4931198225547108993L;
private static final Logger log = LoggerFactory.getLogger(EntityTable.class); private static final Logger log = LoggerFactory.getLogger(EntityTable.class);
static final String COLUMN_DEFINITION = "COLUMN_DEFINITION"; static final String COLUMN_DEFINITION = "COLUMN_DEFINITION";
static final String TABLE_ROW_DATA = "TABLE_ROW_DATA"; static final String TABLE_ROW_DATA = "TABLE_ROW_DATA";
transient final WidgetFactory widgetFactory; final WidgetFactory widgetFactory;
transient final RestCall<Page<ROW>> restCall; final RestCall<Page<ROW>> restCall;
transient final List<ColumnDefinition<ROW>> columns; final List<ColumnDefinition<ROW>> columns;
transient final List<TableRowAction> actions; final List<TableRowAction> actions;
final Composite composite;
private final TableFilter<ROW> filter; private final TableFilter<ROW> filter;
private final Table table; private final Table table;
private final TableNavigator navigator; private final TableNavigator navigator;
@ -62,7 +61,6 @@ public class EntityTable<ROW extends Entity> extends Composite {
private int pageSize; private int pageSize;
private String sortColumn = null; private String sortColumn = null;
private SortOrder sortOrder = SortOrder.ASCENDING; private SortOrder sortOrder = SortOrder.ASCENDING;
private boolean columnsWithSameWidth = true; private boolean columnsWithSameWidth = true;
EntityTable( EntityTable(
@ -74,17 +72,17 @@ public class EntityTable<ROW extends Entity> extends Composite {
final List<TableRowAction> actions, final List<TableRowAction> actions,
final int pageSize) { final int pageSize) {
super(parent, type); this.composite = new Composite(parent, type);
this.widgetFactory = widgetFactory; this.widgetFactory = widgetFactory;
this.restCall = restCall; this.restCall = restCall;
this.columns = Utils.immutableListOf(columns); this.columns = Utils.immutableListOf(columns);
this.actions = Utils.immutableListOf(actions); this.actions = Utils.immutableListOf(actions);
super.setLayout(new GridLayout()); this.composite.setLayout(new GridLayout());
GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, true); GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, true);
gridData.heightHint = (pageSize + 1) * 40; gridData.heightHint = (pageSize + 1) * 40;
super.setLayoutData(gridData); this.composite.setLayoutData(gridData);
this.pageSize = pageSize; this.pageSize = pageSize;
this.filter = columns this.filter = columns
@ -94,7 +92,7 @@ public class EntityTable<ROW extends Entity> extends Composite {
.findFirst() .findFirst()
.isPresent() ? new TableFilter<>(this) : null; .isPresent() ? new TableFilter<>(this) : null;
this.table = widgetFactory.tableLocalized(this); this.table = widgetFactory.tableLocalized(this.composite);
final GridLayout gridLayout = new GridLayout(columns.size(), true); final GridLayout gridLayout = new GridLayout(columns.size(), true);
this.table.setLayout(gridLayout); this.table.setLayout(gridLayout);
gridData = new GridData(SWT.FILL, SWT.CENTER, true, false); gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
@ -248,7 +246,7 @@ public class EntityTable<ROW extends Entity> extends Composite {
// TODO error handling // TODO error handling
}); });
this.layout(true, true); this.composite.layout(true, true);
} }
private Page<ROW> createTableRowsFromPage(final Page<ROW> page) { private Page<ROW> createTableRowsFromPage(final Page<ROW> page) {
@ -340,7 +338,7 @@ public class EntityTable<ROW extends Entity> extends Composite {
this.table.indexOf(tableColumn), this.table.indexOf(tableColumn),
tableColumn.getWidth())) { tableColumn.getWidth())) {
this.layout(true, true); this.composite.layout(true, true);
} }
} }
} }

17
src/main/java/ch/ethz/seb/sebserver/gui/table/TableFilter.java
View file

@ -29,9 +29,7 @@ import ch.ethz.seb.sebserver.gui.table.ColumnDefinition.TableFilterAttribute;
import ch.ethz.seb.sebserver.gui.widget.SingleSelection; import ch.ethz.seb.sebserver.gui.widget.SingleSelection;
import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.ImageIcon; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.ImageIcon;
public class TableFilter<ROW extends Entity> extends Composite { public class TableFilter<ROW extends Entity> {
private static final long serialVersionUID = -2460403977147440766L;
public static enum CriteriaType { public static enum CriteriaType {
TEXT, TEXT,
@ -40,17 +38,18 @@ public class TableFilter<ROW extends Entity> extends Composite {
DATE DATE
} }
private final Composite composite;
private final EntityTable<ROW> entityTable; private final EntityTable<ROW> entityTable;
private final List<FilterComponent> components; private final List<FilterComponent> components;
TableFilter(final EntityTable<ROW> entityTable) { TableFilter(final EntityTable<ROW> entityTable) {
super(entityTable, SWT.NONE); this.composite = new Composite(entityTable.composite, SWT.NONE);
final GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); final GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false);
super.setLayoutData(gridData); this.composite.setLayoutData(gridData);
final RowLayout layout = new RowLayout(SWT.HORIZONTAL); final RowLayout layout = new RowLayout(SWT.HORIZONTAL);
layout.spacing = 5; layout.spacing = 5;
layout.wrap = false; layout.wrap = false;
super.setLayout(layout); this.composite.setLayout(layout);
this.entityTable = entityTable; this.entityTable = entityTable;
this.components = entityTable.columns this.components = entityTable.columns
@ -58,7 +57,7 @@ public class TableFilter<ROW extends Entity> extends Composite {
.map(column -> column.filterAttribute) .map(column -> column.filterAttribute)
//.filter(Objects::nonNull) //.filter(Objects::nonNull)
.map(this::createFilterComponent) .map(this::createFilterComponent)
.map(comp -> comp.build(this)) .map(comp -> comp.build(this.composite))
.map(comp -> comp.reset()) .map(comp -> comp.reset())
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -113,14 +112,14 @@ public class TableFilter<ROW extends Entity> extends Composite {
private void addActions() { private void addActions() {
this.entityTable.widgetFactory.imageButton( this.entityTable.widgetFactory.imageButton(
ImageIcon.SEARCH, ImageIcon.SEARCH,
this, this.composite,
new LocTextKey("sebserver.overall.action.filter"), new LocTextKey("sebserver.overall.action.filter"),
event -> { event -> {
this.entityTable.applyFilter(); this.entityTable.applyFilter();
}); });
this.entityTable.widgetFactory.imageButton( this.entityTable.widgetFactory.imageButton(
ImageIcon.CANCEL, ImageIcon.CANCEL,
this, this.composite,
new LocTextKey("sebserver.overall.action.filter.clear"), new LocTextKey("sebserver.overall.action.filter.clear"),
event -> { event -> {
reset(); reset();

17
src/main/java/ch/ethz/seb/sebserver/gui/table/TableNavigator.java
View file

@ -19,34 +19,33 @@ import org.eclipse.swt.widgets.Label;
import ch.ethz.seb.sebserver.gbl.model.Page; import ch.ethz.seb.sebserver.gbl.model.Page;
import ch.ethz.seb.sebserver.gui.widget.WidgetFactory; import ch.ethz.seb.sebserver.gui.widget.WidgetFactory;
public class TableNavigator extends Composite { public class TableNavigator {
private static final long serialVersionUID = -7349918232061226192L;
private final Composite composite;
private final int pageNavSize = 3; private final int pageNavSize = 3;
private final EntityTable<?> entityTable; private final EntityTable<?> entityTable;
TableNavigator(final EntityTable<?> entityTable) { TableNavigator(final EntityTable<?> entityTable) {
super(entityTable, SWT.NONE); this.composite = new Composite(entityTable.composite, SWT.NONE);
super.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); this.composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
final GridLayout layout = new GridLayout(3, true); final GridLayout layout = new GridLayout(3, true);
layout.marginLeft = 20; layout.marginLeft = 20;
super.setLayout(layout); this.composite.setLayout(layout);
this.entityTable = entityTable; this.entityTable = entityTable;
} }
public Page<?> update(final Page<?> pageData) { public Page<?> update(final Page<?> pageData) {
// clear all // clear all
WidgetFactory.clearComposite(this); WidgetFactory.clearComposite(this.composite);
final int pageNumber = pageData.getPageNumber(); final int pageNumber = pageData.getPageNumber();
final int numberOfPages = pageData.getNumberOfPages(); final int numberOfPages = pageData.getNumberOfPages();
createPagingHeader(pageNumber, numberOfPages); createPagingHeader(pageNumber, numberOfPages);
final Composite numNav = new Composite(this, SWT.NONE); final Composite numNav = new Composite(this.composite, SWT.NONE);
numNav.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); numNav.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
final RowLayout rowLayout = new RowLayout(SWT.HORIZONTAL); final RowLayout rowLayout = new RowLayout(SWT.HORIZONTAL);
rowLayout.spacing = 5; rowLayout.spacing = 5;
@ -72,7 +71,7 @@ public class TableNavigator extends Composite {
} }
private void createPagingHeader(final int page, final int of) { private void createPagingHeader(final int page, final int of) {
final Label pageHeader = new Label(this, SWT.NONE); final Label pageHeader = new Label(this.composite, SWT.NONE);
pageHeader.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); pageHeader.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
pageHeader.setText("Page " + page + "/" + of); pageHeader.setText("Page " + page + "/" + of);
} }

2
src/main/java/ch/ethz/seb/sebserver/gui/widget/Selection.java
View file

@ -22,4 +22,6 @@ public interface Selection {
void clear(); void clear();
void setVisible(boolean visible);
} }

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

@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class AdditionalAttributesDynamicSqlSupport { public final class AdditionalAttributesDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.935+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source Table: additional_attributes")
public static final AdditionalAttributes additionalAttributes = new AdditionalAttributes(); public static final AdditionalAttributes additionalAttributes = new AdditionalAttributes();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.935+01:00", comments="Source field: additional_attributes.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source field: additional_attributes.id")
public static final SqlColumn<Long> id = additionalAttributes.id; public static final SqlColumn<Long> id = additionalAttributes.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.935+01:00", comments="Source field: additional_attributes.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source field: additional_attributes.entity_type")
public static final SqlColumn<String> entityType = additionalAttributes.entityType; public static final SqlColumn<String> entityType = additionalAttributes.entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.935+01:00", comments="Source field: additional_attributes.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source field: additional_attributes.entity_id")
public static final SqlColumn<Long> entityId = additionalAttributes.entityId; public static final SqlColumn<Long> entityId = additionalAttributes.entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.935+01:00", comments="Source field: additional_attributes.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source field: additional_attributes.name")
public static final SqlColumn<String> name = additionalAttributes.name; public static final SqlColumn<String> name = additionalAttributes.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.935+01:00", comments="Source field: additional_attributes.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source field: additional_attributes.value")
public static final SqlColumn<String> value = additionalAttributes.value; public static final SqlColumn<String> value = additionalAttributes.value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.935+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.717+01:00", comments="Source Table: additional_attributes")
public static final class AdditionalAttributes extends SqlTable { public static final class AdditionalAttributes extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

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

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

@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ClientConnectionRecordDynamicSqlSupport { public final class ClientConnectionRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.893+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source Table: client_connection")
public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.893+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.id")
public static final SqlColumn<Long> id = clientConnectionRecord.id; public static final SqlColumn<Long> id = clientConnectionRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.894+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.exam_id")
public static final SqlColumn<Long> examId = clientConnectionRecord.examId; public static final SqlColumn<Long> examId = clientConnectionRecord.examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.894+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.status")
public static final SqlColumn<String> status = clientConnectionRecord.status; public static final SqlColumn<String> status = clientConnectionRecord.status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.894+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.connection_token")
public static final SqlColumn<String> connectionToken = clientConnectionRecord.connectionToken; public static final SqlColumn<String> connectionToken = clientConnectionRecord.connectionToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.894+01:00", comments="Source field: client_connection.user_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.user_name")
public static final SqlColumn<String> userName = clientConnectionRecord.userName; public static final SqlColumn<String> userName = clientConnectionRecord.userName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.895+01:00", comments="Source field: client_connection.vdi") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source field: client_connection.vdi")
public static final SqlColumn<Boolean> vdi = clientConnectionRecord.vdi; public static final SqlColumn<Boolean> vdi = clientConnectionRecord.vdi;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.895+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source field: client_connection.client_address")
public static final SqlColumn<String> clientAddress = clientConnectionRecord.clientAddress; public static final SqlColumn<String> clientAddress = clientConnectionRecord.clientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.895+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source field: client_connection.virtual_client_address")
public static final SqlColumn<String> virtualClientAddress = clientConnectionRecord.virtualClientAddress; public static final SqlColumn<String> virtualClientAddress = clientConnectionRecord.virtualClientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.893+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.687+01:00", comments="Source Table: client_connection")
public static final class ClientConnectionRecord extends SqlTable { public static final class ClientConnectionRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ClientConnectionRecordMapper { public interface ClientConnectionRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.895+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.895+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.895+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ClientConnectionRecord> insertStatement); int insert(InsertStatementProvider<ClientConnectionRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -59,7 +59,7 @@ public interface ClientConnectionRecordMapper {
}) })
ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); ClientConnectionRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -73,22 +73,22 @@ public interface ClientConnectionRecordMapper {
}) })
List<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement); List<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(clientConnectionRecord); .from(clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord); return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord) return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -96,7 +96,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
default int insert(ClientConnectionRecord record) { default int insert(ClientConnectionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientConnectionRecord) .into(clientConnectionRecord)
@ -111,7 +111,7 @@ public interface ClientConnectionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
default int insertSelective(ClientConnectionRecord record) { default int insertSelective(ClientConnectionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientConnectionRecord) .into(clientConnectionRecord)
@ -126,19 +126,19 @@ public interface ClientConnectionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) return SelectDSL.selectWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress)
.from(clientConnectionRecord); .from(clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress)
.from(clientConnectionRecord); .from(clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.688+01:00", comments="Source Table: client_connection")
default ClientConnectionRecord selectByPrimaryKey(Long id_) { default ClientConnectionRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) return SelectDSL.selectWithMapper(this::selectOne, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress)
.from(clientConnectionRecord) .from(clientConnectionRecord)
@ -147,7 +147,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source Table: client_connection")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientConnectionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -159,7 +159,7 @@ public interface ClientConnectionRecordMapper {
.set(virtualClientAddress).equalTo(record::getVirtualClientAddress); .set(virtualClientAddress).equalTo(record::getVirtualClientAddress);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.896+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source Table: client_connection")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientConnectionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)
@ -171,7 +171,7 @@ public interface ClientConnectionRecordMapper {
.set(virtualClientAddress).equalToWhenPresent(record::getVirtualClientAddress); .set(virtualClientAddress).equalToWhenPresent(record::getVirtualClientAddress);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.897+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source Table: client_connection")
default int updateByPrimaryKey(ClientConnectionRecord record) { default int updateByPrimaryKey(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -186,7 +186,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.897+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source Table: client_connection")
default int updateByPrimaryKeySelective(ClientConnectionRecord record) { default int updateByPrimaryKeySelective(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)

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

@ -7,31 +7,31 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ClientEventRecordDynamicSqlSupport { public final class ClientEventRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source Table: client_event")
public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); public static final ClientEventRecord clientEventRecord = new ClientEventRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.id")
public static final SqlColumn<Long> id = clientEventRecord.id; public static final SqlColumn<Long> id = clientEventRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.899+01:00", comments="Source field: client_event.connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.connection_id")
public static final SqlColumn<Long> connectionId = clientEventRecord.connectionId; public static final SqlColumn<Long> connectionId = clientEventRecord.connectionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.899+01:00", comments="Source field: client_event.user_identifier") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.user_identifier")
public static final SqlColumn<String> userIdentifier = clientEventRecord.userIdentifier; public static final SqlColumn<String> userIdentifier = clientEventRecord.userIdentifier;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.899+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.type")
public static final SqlColumn<Integer> type = clientEventRecord.type; public static final SqlColumn<Integer> type = clientEventRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.899+01:00", comments="Source field: client_event.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.timestamp")
public static final SqlColumn<Long> timestamp = clientEventRecord.timestamp; public static final SqlColumn<Long> timestamp = clientEventRecord.timestamp;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.899+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.numeric_value")
public static final SqlColumn<BigDecimal> numericValue = clientEventRecord.numericValue; public static final SqlColumn<BigDecimal> numericValue = clientEventRecord.numericValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.900+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.text")
public static final SqlColumn<String> text = clientEventRecord.text; public static final SqlColumn<String> text = clientEventRecord.text;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source Table: client_event")
public static final class ClientEventRecord extends SqlTable { public static final class ClientEventRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ClientEventRecordMapper { public interface ClientEventRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.900+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source Table: client_event")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.900+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source Table: client_event")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source Table: client_event")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ClientEventRecord> insertStatement); int insert(InsertStatementProvider<ClientEventRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -59,7 +59,7 @@ public interface ClientEventRecordMapper {
}) })
ClientEventRecord selectOne(SelectStatementProvider selectStatement); ClientEventRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -72,22 +72,22 @@ public interface ClientEventRecordMapper {
}) })
List<ClientEventRecord> selectMany(SelectStatementProvider selectStatement); List<ClientEventRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(clientEventRecord); .from(clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord); return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord) return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -95,7 +95,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default int insert(ClientEventRecord record) { default int insert(ClientEventRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientEventRecord) .into(clientEventRecord)
@ -109,7 +109,7 @@ public interface ClientEventRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default int insertSelective(ClientEventRecord record) { default int insertSelective(ClientEventRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientEventRecord) .into(clientEventRecord)
@ -123,19 +123,19 @@ public interface ClientEventRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text) return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
.from(clientEventRecord); .from(clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
.from(clientEventRecord); .from(clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.901+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default ClientEventRecord selectByPrimaryKey(Long id_) { default ClientEventRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, userIdentifier, type, timestamp, numericValue, text) return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
.from(clientEventRecord) .from(clientEventRecord)
@ -144,7 +144,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.902+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientEventRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(connectionId).equalTo(record::getConnectionId) .set(connectionId).equalTo(record::getConnectionId)
@ -155,7 +155,7 @@ public interface ClientEventRecordMapper {
.set(text).equalTo(record::getText); .set(text).equalTo(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.902+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientEventRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(connectionId).equalToWhenPresent(record::getConnectionId) .set(connectionId).equalToWhenPresent(record::getConnectionId)
@ -166,7 +166,7 @@ public interface ClientEventRecordMapper {
.set(text).equalToWhenPresent(record::getText); .set(text).equalToWhenPresent(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.902+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default int updateByPrimaryKey(ClientEventRecord record) { default int updateByPrimaryKey(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(connectionId).equalTo(record::getConnectionId) .set(connectionId).equalTo(record::getConnectionId)
@ -180,7 +180,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.902+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.691+01:00", comments="Source Table: client_event")
default int updateByPrimaryKeySelective(ClientEventRecord record) { default int updateByPrimaryKeySelective(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(connectionId).equalToWhenPresent(record::getConnectionId) .set(connectionId).equalToWhenPresent(record::getConnectionId)

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

@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationAttributeRecordDynamicSqlSupport { public final class ConfigurationAttributeRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.581+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.509+01:00", comments="Source Table: configuration_attribute")
public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.587+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.512+01:00", comments="Source field: configuration_attribute.id")
public static final SqlColumn<Long> id = configurationAttributeRecord.id; public static final SqlColumn<Long> id = configurationAttributeRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.589+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.513+01:00", comments="Source field: configuration_attribute.name")
public static final SqlColumn<String> name = configurationAttributeRecord.name; public static final SqlColumn<String> name = configurationAttributeRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.589+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.513+01:00", comments="Source field: configuration_attribute.type")
public static final SqlColumn<String> type = configurationAttributeRecord.type; public static final SqlColumn<String> type = configurationAttributeRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.589+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.513+01:00", comments="Source field: configuration_attribute.parent_id")
public static final SqlColumn<Long> parentId = configurationAttributeRecord.parentId; public static final SqlColumn<Long> parentId = configurationAttributeRecord.parentId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.589+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.513+01:00", comments="Source field: configuration_attribute.resources")
public static final SqlColumn<String> resources = configurationAttributeRecord.resources; public static final SqlColumn<String> resources = configurationAttributeRecord.resources;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.590+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.513+01:00", comments="Source field: configuration_attribute.validator")
public static final SqlColumn<String> validator = configurationAttributeRecord.validator; public static final SqlColumn<String> validator = configurationAttributeRecord.validator;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.613+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.514+01:00", comments="Source field: configuration_attribute.dependencies")
public static final SqlColumn<String> dependencies = configurationAttributeRecord.dependencies; public static final SqlColumn<String> dependencies = configurationAttributeRecord.dependencies;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.614+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.514+01:00", comments="Source field: configuration_attribute.default_value")
public static final SqlColumn<String> defaultValue = configurationAttributeRecord.defaultValue; public static final SqlColumn<String> defaultValue = configurationAttributeRecord.defaultValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.587+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.511+01:00", comments="Source Table: configuration_attribute")
public static final class ConfigurationAttributeRecord extends SqlTable { public static final class ConfigurationAttributeRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ConfigurationAttributeRecordMapper { public interface ConfigurationAttributeRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.617+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.515+01:00", comments="Source Table: configuration_attribute")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.619+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.516+01:00", comments="Source Table: configuration_attribute")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.620+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.517+01:00", comments="Source Table: configuration_attribute")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ConfigurationAttributeRecord> insertStatement); int insert(InsertStatementProvider<ConfigurationAttributeRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.623+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.518+01:00", comments="Source Table: configuration_attribute")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -59,7 +59,7 @@ public interface ConfigurationAttributeRecordMapper {
}) })
ConfigurationAttributeRecord selectOne(SelectStatementProvider selectStatement); ConfigurationAttributeRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.627+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.519+01:00", comments="Source Table: configuration_attribute")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -73,22 +73,22 @@ public interface ConfigurationAttributeRecordMapper {
}) })
List<ConfigurationAttributeRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationAttributeRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.628+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.520+01:00", comments="Source Table: configuration_attribute")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.629+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.521+01:00", comments="Source Table: configuration_attribute")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(configurationAttributeRecord); .from(configurationAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.630+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.521+01:00", comments="Source Table: configuration_attribute")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord); return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.631+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.522+01:00", comments="Source Table: configuration_attribute")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -96,7 +96,7 @@ public interface ConfigurationAttributeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.632+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.522+01:00", comments="Source Table: configuration_attribute")
default int insert(ConfigurationAttributeRecord record) { default int insert(ConfigurationAttributeRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationAttributeRecord) .into(configurationAttributeRecord)
@ -111,7 +111,7 @@ public interface ConfigurationAttributeRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.635+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.523+01:00", comments="Source Table: configuration_attribute")
default int insertSelective(ConfigurationAttributeRecord record) { default int insertSelective(ConfigurationAttributeRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationAttributeRecord) .into(configurationAttributeRecord)
@ -126,19 +126,19 @@ public interface ConfigurationAttributeRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.636+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.524+01:00", comments="Source Table: configuration_attribute")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) return SelectDSL.selectWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue)
.from(configurationAttributeRecord); .from(configurationAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.638+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.525+01:00", comments="Source Table: configuration_attribute")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue)
.from(configurationAttributeRecord); .from(configurationAttributeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.639+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.525+01:00", comments="Source Table: configuration_attribute")
default ConfigurationAttributeRecord selectByPrimaryKey(Long id_) { default ConfigurationAttributeRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, name, type, parentId, resources, validator, dependencies, defaultValue) return SelectDSL.selectWithMapper(this::selectOne, id, name, type, parentId, resources, validator, dependencies, defaultValue)
.from(configurationAttributeRecord) .from(configurationAttributeRecord)
@ -147,7 +147,7 @@ public interface ConfigurationAttributeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.639+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.526+01:00", comments="Source Table: configuration_attribute")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationAttributeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -159,7 +159,7 @@ public interface ConfigurationAttributeRecordMapper {
.set(defaultValue).equalTo(record::getDefaultValue); .set(defaultValue).equalTo(record::getDefaultValue);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.641+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.526+01:00", comments="Source Table: configuration_attribute")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationAttributeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)
@ -171,7 +171,7 @@ public interface ConfigurationAttributeRecordMapper {
.set(defaultValue).equalToWhenPresent(record::getDefaultValue); .set(defaultValue).equalToWhenPresent(record::getDefaultValue);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.642+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.527+01:00", comments="Source Table: configuration_attribute")
default int updateByPrimaryKey(ConfigurationAttributeRecord record) { default int updateByPrimaryKey(ConfigurationAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -186,7 +186,7 @@ public interface ConfigurationAttributeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.643+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.528+01:00", comments="Source Table: configuration_attribute")
default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) { default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)

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

@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationNodeRecordDynamicSqlSupport { public final class ConfigurationNodeRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source Table: configuration_node")
public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.862+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.id")
public static final SqlColumn<Long> id = configurationNodeRecord.id; public static final SqlColumn<Long> id = configurationNodeRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.862+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.institution_id")
public static final SqlColumn<Long> institutionId = configurationNodeRecord.institutionId; public static final SqlColumn<Long> institutionId = configurationNodeRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.862+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.owner")
public static final SqlColumn<String> owner = configurationNodeRecord.owner; public static final SqlColumn<String> owner = configurationNodeRecord.owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.862+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.name")
public static final SqlColumn<String> name = configurationNodeRecord.name; public static final SqlColumn<String> name = configurationNodeRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.862+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.description")
public static final SqlColumn<String> description = configurationNodeRecord.description; public static final SqlColumn<String> description = configurationNodeRecord.description;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.863+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source field: configuration_node.type")
public static final SqlColumn<String> type = configurationNodeRecord.type; public static final SqlColumn<String> type = configurationNodeRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.863+01:00", comments="Source field: configuration_node.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source field: configuration_node.template")
public static final SqlColumn<String> template = configurationNodeRecord.template; public static final SqlColumn<String> template = configurationNodeRecord.template;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.863+01:00", comments="Source field: configuration_node.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source field: configuration_node.active")
public static final SqlColumn<Integer> active = configurationNodeRecord.active; public static final SqlColumn<Integer> active = configurationNodeRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.862+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source Table: configuration_node")
public static final class ConfigurationNodeRecord extends SqlTable { public static final class ConfigurationNodeRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ConfigurationNodeRecordMapper { public interface ConfigurationNodeRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.863+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.863+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.863+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ConfigurationNodeRecord> insertStatement); int insert(InsertStatementProvider<ConfigurationNodeRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.863+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -59,7 +59,7 @@ public interface ConfigurationNodeRecordMapper {
}) })
ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement); ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.864+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -73,22 +73,22 @@ public interface ConfigurationNodeRecordMapper {
}) })
List<ConfigurationNodeRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationNodeRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.864+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.864+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(configurationNodeRecord); .from(configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.864+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.663+01:00", comments="Source Table: configuration_node")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord); return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.864+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -96,7 +96,7 @@ public interface ConfigurationNodeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.864+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node")
default int insert(ConfigurationNodeRecord record) { default int insert(ConfigurationNodeRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationNodeRecord) .into(configurationNodeRecord)
@ -111,7 +111,7 @@ public interface ConfigurationNodeRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.864+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node")
default int insertSelective(ConfigurationNodeRecord record) { default int insertSelective(ConfigurationNodeRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationNodeRecord) .into(configurationNodeRecord)
@ -126,19 +126,19 @@ public interface ConfigurationNodeRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.864+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active)
.from(configurationNodeRecord); .from(configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.864+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active)
.from(configurationNodeRecord); .from(configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.865+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node")
default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { default ConfigurationNodeRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, name, description, type, template, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, name, description, type, template, active)
.from(configurationNodeRecord) .from(configurationNodeRecord)
@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.865+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationNodeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -159,7 +159,7 @@ public interface ConfigurationNodeRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.865+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.664+01:00", comments="Source Table: configuration_node")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationNodeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -171,7 +171,7 @@ public interface ConfigurationNodeRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.867+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.665+01:00", comments="Source Table: configuration_node")
default int updateByPrimaryKey(ConfigurationNodeRecord record) { default int updateByPrimaryKey(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -186,7 +186,7 @@ public interface ConfigurationNodeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.868+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.665+01:00", comments="Source Table: configuration_node")
default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) { default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -7,25 +7,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationRecordDynamicSqlSupport { public final class ConfigurationRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.854+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source Table: configuration")
public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); public static final ConfigurationRecord configurationRecord = new ConfigurationRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.855+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.id")
public static final SqlColumn<Long> id = configurationRecord.id; public static final SqlColumn<Long> id = configurationRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.855+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source field: configuration.configuration_node_id")
public static final SqlColumn<Long> configurationNodeId = configurationRecord.configurationNodeId; public static final SqlColumn<Long> configurationNodeId = configurationRecord.configurationNodeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.856+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source field: configuration.version")
public static final SqlColumn<String> version = configurationRecord.version; public static final SqlColumn<String> version = configurationRecord.version;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.856+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source field: configuration.version_date")
public static final SqlColumn<DateTime> versionDate = configurationRecord.versionDate; public static final SqlColumn<DateTime> versionDate = configurationRecord.versionDate;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.856+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source field: configuration.followup")
public static final SqlColumn<Integer> followup = configurationRecord.followup; public static final SqlColumn<Integer> followup = configurationRecord.followup;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.855+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source Table: configuration")
public static final class ConfigurationRecord extends SqlTable { public static final class ConfigurationRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ConfigurationRecordMapper { public interface ConfigurationRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.857+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.857+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.857+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ConfigurationRecord> insertStatement); int insert(InsertStatementProvider<ConfigurationRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.858+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -58,7 +58,7 @@ public interface ConfigurationRecordMapper {
}) })
ConfigurationRecord selectOne(SelectStatementProvider selectStatement); ConfigurationRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.858+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -69,22 +69,22 @@ public interface ConfigurationRecordMapper {
}) })
List<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.858+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.858+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(configurationRecord); .from(configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.858+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.858+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -92,7 +92,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.858+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
default int insert(ConfigurationRecord record) { default int insert(ConfigurationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationRecord) .into(configurationRecord)
@ -104,7 +104,7 @@ public interface ConfigurationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.859+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.659+01:00", comments="Source Table: configuration")
default int insertSelective(ConfigurationRecord record) { default int insertSelective(ConfigurationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationRecord) .into(configurationRecord)
@ -116,19 +116,19 @@ public interface ConfigurationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.859+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup) return SelectDSL.selectWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup)
.from(configurationRecord); .from(configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.859+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup)
.from(configurationRecord); .from(configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.859+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration")
default ConfigurationRecord selectByPrimaryKey(Long id_) { default ConfigurationRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, configurationNodeId, version, versionDate, followup) return SelectDSL.selectWithMapper(this::selectOne, id, configurationNodeId, version, versionDate, followup)
.from(configurationRecord) .from(configurationRecord)
@ -137,7 +137,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.859+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(configurationNodeId).equalTo(record::getConfigurationNodeId) .set(configurationNodeId).equalTo(record::getConfigurationNodeId)
@ -146,7 +146,7 @@ public interface ConfigurationRecordMapper {
.set(followup).equalTo(record::getFollowup); .set(followup).equalTo(record::getFollowup);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.859+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId) .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId)
@ -155,7 +155,7 @@ public interface ConfigurationRecordMapper {
.set(followup).equalToWhenPresent(record::getFollowup); .set(followup).equalToWhenPresent(record::getFollowup);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.859+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration")
default int updateByPrimaryKey(ConfigurationRecord record) { default int updateByPrimaryKey(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(configurationNodeId).equalTo(record::getConfigurationNodeId) .set(configurationNodeId).equalTo(record::getConfigurationNodeId)
@ -167,7 +167,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.859+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration")
default int updateByPrimaryKeySelective(ConfigurationRecord record) { default int updateByPrimaryKeySelective(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId) .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId)

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

@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationValueRecordDynamicSqlSupport { public final class ConfigurationValueRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.836+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source Table: configuration_value")
public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.836+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source field: configuration_value.id")
public static final SqlColumn<Long> id = configurationValueRecord.id; public static final SqlColumn<Long> id = configurationValueRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.836+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source field: configuration_value.configuration_id")
public static final SqlColumn<Long> configurationId = configurationValueRecord.configurationId; public static final SqlColumn<Long> configurationId = configurationValueRecord.configurationId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.836+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source field: configuration_value.configuration_attribute_id")
public static final SqlColumn<Long> configurationAttributeId = configurationValueRecord.configurationAttributeId; public static final SqlColumn<Long> configurationAttributeId = configurationValueRecord.configurationAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.837+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source field: configuration_value.list_index")
public static final SqlColumn<Integer> listIndex = configurationValueRecord.listIndex; public static final SqlColumn<Integer> listIndex = configurationValueRecord.listIndex;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.837+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source field: configuration_value.value")
public static final SqlColumn<String> value = configurationValueRecord.value; public static final SqlColumn<String> value = configurationValueRecord.value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.837+01:00", comments="Source field: configuration_value.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source field: configuration_value.text")
public static final SqlColumn<String> text = configurationValueRecord.text; public static final SqlColumn<String> text = configurationValueRecord.text;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.836+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source Table: configuration_value")
public static final class ConfigurationValueRecord extends SqlTable { public static final class ConfigurationValueRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ConfigurationValueRecordMapper { public interface ConfigurationValueRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.837+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source Table: configuration_value")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.837+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source Table: configuration_value")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.837+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source Table: configuration_value")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ConfigurationValueRecord> insertStatement); int insert(InsertStatementProvider<ConfigurationValueRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.837+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source Table: configuration_value")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -57,7 +57,7 @@ public interface ConfigurationValueRecordMapper {
}) })
ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement); ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.837+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.649+01:00", comments="Source Table: configuration_value")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -69,22 +69,22 @@ public interface ConfigurationValueRecordMapper {
}) })
List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.837+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.838+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(configurationValueRecord); .from(configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.838+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord); return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.838+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -92,7 +92,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.838+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
default int insert(ConfigurationValueRecord record) { default int insert(ConfigurationValueRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationValueRecord) .into(configurationValueRecord)
@ -105,7 +105,7 @@ public interface ConfigurationValueRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.838+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
default int insertSelective(ConfigurationValueRecord record) { default int insertSelective(ConfigurationValueRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationValueRecord) .into(configurationValueRecord)
@ -118,19 +118,19 @@ public interface ConfigurationValueRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.838+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text) return SelectDSL.selectWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text)
.from(configurationValueRecord); .from(configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.838+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text)
.from(configurationValueRecord); .from(configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.838+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
default ConfigurationValueRecord selectByPrimaryKey(Long id_) { default ConfigurationValueRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, configurationId, configurationAttributeId, listIndex, value, text) return SelectDSL.selectWithMapper(this::selectOne, id, configurationId, configurationAttributeId, listIndex, value, text)
.from(configurationValueRecord) .from(configurationValueRecord)
@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.838+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(configurationId).equalTo(record::getConfigurationId) .set(configurationId).equalTo(record::getConfigurationId)
@ -149,7 +149,7 @@ public interface ConfigurationValueRecordMapper {
.set(text).equalTo(record::getText); .set(text).equalTo(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.838+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.650+01:00", comments="Source Table: configuration_value")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(configurationId).equalToWhenPresent(record::getConfigurationId) .set(configurationId).equalToWhenPresent(record::getConfigurationId)
@ -159,7 +159,7 @@ public interface ConfigurationValueRecordMapper {
.set(text).equalToWhenPresent(record::getText); .set(text).equalToWhenPresent(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.839+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source Table: configuration_value")
default int updateByPrimaryKey(ConfigurationValueRecord record) { default int updateByPrimaryKey(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(configurationId).equalTo(record::getConfigurationId) .set(configurationId).equalTo(record::getConfigurationId)
@ -172,7 +172,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.839+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source Table: configuration_value")
default int updateByPrimaryKeySelective(ConfigurationValueRecord record) { default int updateByPrimaryKeySelective(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(configurationId).equalToWhenPresent(record::getConfigurationId) .set(configurationId).equalToWhenPresent(record::getConfigurationId)

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

@ -6,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ExamConfigurationMapRecordDynamicSqlSupport { public final class ExamConfigurationMapRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.880+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.667+01:00", comments="Source Table: exam_configuration_map")
public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.881+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source field: exam_configuration_map.id")
public static final SqlColumn<Long> id = examConfigurationMapRecord.id; public static final SqlColumn<Long> id = examConfigurationMapRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.881+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source field: exam_configuration_map.exam_id")
public static final SqlColumn<Long> examId = examConfigurationMapRecord.examId; public static final SqlColumn<Long> examId = examConfigurationMapRecord.examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.881+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
public static final SqlColumn<Long> configurationNodeId = examConfigurationMapRecord.configurationNodeId; public static final SqlColumn<Long> configurationNodeId = examConfigurationMapRecord.configurationNodeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.881+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source field: exam_configuration_map.user_names")
public static final SqlColumn<String> userNames = examConfigurationMapRecord.userNames; public static final SqlColumn<String> userNames = examConfigurationMapRecord.userNames;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.881+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source Table: exam_configuration_map")
public static final class ExamConfigurationMapRecord extends SqlTable { public static final class ExamConfigurationMapRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ExamConfigurationMapRecordMapper { public interface ExamConfigurationMapRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.881+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source Table: exam_configuration_map")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.881+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source Table: exam_configuration_map")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source Table: exam_configuration_map")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ExamConfigurationMapRecord> insertStatement); int insert(InsertStatementProvider<ExamConfigurationMapRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.678+01:00", comments="Source Table: exam_configuration_map")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -55,7 +55,7 @@ public interface ExamConfigurationMapRecordMapper {
}) })
ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement); ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -65,22 +65,22 @@ public interface ExamConfigurationMapRecordMapper {
}) })
List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement); List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(examConfigurationMapRecord); .from(examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord); return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord) return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -88,7 +88,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
default int insert(ExamConfigurationMapRecord record) { default int insert(ExamConfigurationMapRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examConfigurationMapRecord) .into(examConfigurationMapRecord)
@ -99,7 +99,7 @@ public interface ExamConfigurationMapRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
default int insertSelective(ExamConfigurationMapRecord record) { default int insertSelective(ExamConfigurationMapRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examConfigurationMapRecord) .into(examConfigurationMapRecord)
@ -110,19 +110,19 @@ public interface ExamConfigurationMapRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, examId, configurationNodeId, userNames) return SelectDSL.selectWithMapper(this::selectMany, id, examId, configurationNodeId, userNames)
.from(examConfigurationMapRecord); .from(examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, configurationNodeId, userNames) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, configurationNodeId, userNames)
.from(examConfigurationMapRecord); .from(examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.882+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) { default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, examId, configurationNodeId, userNames) return SelectDSL.selectWithMapper(this::selectOne, id, examId, configurationNodeId, userNames)
.from(examConfigurationMapRecord) .from(examConfigurationMapRecord)
@ -131,7 +131,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.883+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.679+01:00", comments="Source Table: exam_configuration_map")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper {
.set(userNames).equalTo(record::getUserNames); .set(userNames).equalTo(record::getUserNames);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.884+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.680+01:00", comments="Source Table: exam_configuration_map")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)
@ -147,7 +147,7 @@ public interface ExamConfigurationMapRecordMapper {
.set(userNames).equalToWhenPresent(record::getUserNames); .set(userNames).equalToWhenPresent(record::getUserNames);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.884+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.680+01:00", comments="Source Table: exam_configuration_map")
default int updateByPrimaryKey(ExamConfigurationMapRecord record) { default int updateByPrimaryKey(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -158,7 +158,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.884+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.680+01:00", comments="Source Table: exam_configuration_map")
default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) { default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)

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

@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ExamRecordDynamicSqlSupport { public final class ExamRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.887+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source Table: exam")
public static final ExamRecord examRecord = new ExamRecord(); public static final ExamRecord examRecord = new ExamRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.887+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.id")
public static final SqlColumn<Long> id = examRecord.id; public static final SqlColumn<Long> id = examRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.887+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.institution_id")
public static final SqlColumn<Long> institutionId = examRecord.institutionId; public static final SqlColumn<Long> institutionId = examRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.888+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.lms_setup_id")
public static final SqlColumn<Long> lmsSetupId = examRecord.lmsSetupId; public static final SqlColumn<Long> lmsSetupId = examRecord.lmsSetupId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.888+01:00", comments="Source field: exam.external_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.external_id")
public static final SqlColumn<String> externalId = examRecord.externalId; public static final SqlColumn<String> externalId = examRecord.externalId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.888+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.owner")
public static final SqlColumn<String> owner = examRecord.owner; public static final SqlColumn<String> owner = examRecord.owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.888+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.supporter")
public static final SqlColumn<String> supporter = examRecord.supporter; public static final SqlColumn<String> supporter = examRecord.supporter;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.888+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.type")
public static final SqlColumn<String> type = examRecord.type; public static final SqlColumn<String> type = examRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.888+01:00", comments="Source field: exam.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.status")
public static final SqlColumn<String> status = examRecord.status; public static final SqlColumn<String> status = examRecord.status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.888+01:00", comments="Source field: exam.quit_password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.quit_password")
public static final SqlColumn<String> quitPassword = examRecord.quitPassword; public static final SqlColumn<String> quitPassword = examRecord.quitPassword;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.888+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source field: exam.active")
public static final SqlColumn<Integer> active = examRecord.active; public static final SqlColumn<Integer> active = examRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.887+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source Table: exam")
public static final class ExamRecord extends SqlTable { public static final class ExamRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ExamRecordMapper { public interface ExamRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.683+01:00", comments="Source Table: exam")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ExamRecord> insertStatement); int insert(InsertStatementProvider<ExamRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -61,7 +61,7 @@ public interface ExamRecordMapper {
}) })
ExamRecord selectOne(SelectStatementProvider selectStatement); ExamRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -77,22 +77,22 @@ public interface ExamRecordMapper {
}) })
List<ExamRecord> selectMany(SelectStatementProvider selectStatement); List<ExamRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(examRecord); .from(examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); return DeleteDSL.deleteFromWithMapper(this::delete, examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, examRecord) return DeleteDSL.deleteFromWithMapper(this::delete, examRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -100,7 +100,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
default int insert(ExamRecord record) { default int insert(ExamRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examRecord) .into(examRecord)
@ -117,7 +117,7 @@ public interface ExamRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
default int insertSelective(ExamRecord record) { default int insertSelective(ExamRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examRecord) .into(examRecord)
@ -134,19 +134,19 @@ public interface ExamRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active)
.from(examRecord); .from(examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active)
.from(examRecord); .from(examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.684+01:00", comments="Source Table: exam")
default ExamRecord selectByPrimaryKey(Long id_) { default ExamRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active)
.from(examRecord) .from(examRecord)
@ -155,7 +155,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.889+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source Table: exam")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamRecord record) {
return UpdateDSL.updateWithMapper(this::update, examRecord) return UpdateDSL.updateWithMapper(this::update, examRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -169,7 +169,7 @@ public interface ExamRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.890+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source Table: exam")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamRecord record) {
return UpdateDSL.updateWithMapper(this::update, examRecord) return UpdateDSL.updateWithMapper(this::update, examRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -183,7 +183,7 @@ public interface ExamRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.890+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source Table: exam")
default int updateByPrimaryKey(ExamRecord record) { default int updateByPrimaryKey(ExamRecord record) {
return UpdateDSL.updateWithMapper(this::update, examRecord) return UpdateDSL.updateWithMapper(this::update, examRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -200,7 +200,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.890+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source Table: exam")
default int updateByPrimaryKeySelective(ExamRecord record) { default int updateByPrimaryKeySelective(ExamRecord record) {
return UpdateDSL.updateWithMapper(this::update, examRecord) return UpdateDSL.updateWithMapper(this::update, examRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class IndicatorRecordDynamicSqlSupport { public final class IndicatorRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source Table: indicator")
public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); public static final IndicatorRecord indicatorRecord = new IndicatorRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.id")
public static final SqlColumn<Long> id = indicatorRecord.id; public static final SqlColumn<Long> id = indicatorRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.exam_id")
public static final SqlColumn<Long> examId = indicatorRecord.examId; public static final SqlColumn<Long> examId = indicatorRecord.examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.type")
public static final SqlColumn<String> type = indicatorRecord.type; public static final SqlColumn<String> type = indicatorRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.693+01:00", comments="Source field: indicator.name")
public static final SqlColumn<String> name = indicatorRecord.name; public static final SqlColumn<String> name = indicatorRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.904+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.693+01:00", comments="Source field: indicator.color")
public static final SqlColumn<String> color = indicatorRecord.color; public static final SqlColumn<String> color = indicatorRecord.color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source Table: indicator")
public static final class IndicatorRecord extends SqlTable { public static final class IndicatorRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

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

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

@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class InstitutionRecordDynamicSqlSupport { public final class InstitutionRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.908+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution")
public static final InstitutionRecord institutionRecord = new InstitutionRecord(); public static final InstitutionRecord institutionRecord = new InstitutionRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.908+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.id")
public static final SqlColumn<Long> id = institutionRecord.id; public static final SqlColumn<Long> id = institutionRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.908+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.name")
public static final SqlColumn<String> name = institutionRecord.name; public static final SqlColumn<String> name = institutionRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.908+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.url_suffix")
public static final SqlColumn<String> urlSuffix = institutionRecord.urlSuffix; public static final SqlColumn<String> urlSuffix = institutionRecord.urlSuffix;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.909+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.active")
public static final SqlColumn<Integer> active = institutionRecord.active; public static final SqlColumn<Integer> active = institutionRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.909+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.logo_image")
public static final SqlColumn<String> logoImage = institutionRecord.logoImage; public static final SqlColumn<String> logoImage = institutionRecord.logoImage;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.908+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution")
public static final class InstitutionRecord extends SqlTable { public static final class InstitutionRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface InstitutionRecordMapper { public interface InstitutionRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.909+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.909+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.909+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<InstitutionRecord> insertStatement); int insert(InsertStatementProvider<InstitutionRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.909+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -56,7 +56,7 @@ public interface InstitutionRecordMapper {
}) })
InstitutionRecord selectOne(SelectStatementProvider selectStatement); InstitutionRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.909+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -67,22 +67,22 @@ public interface InstitutionRecordMapper {
}) })
List<InstitutionRecord> selectMany(SelectStatementProvider selectStatement); List<InstitutionRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.909+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.909+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source Table: institution")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(institutionRecord); .from(institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -90,7 +90,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default int insert(InstitutionRecord record) { default int insert(InstitutionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(institutionRecord) .into(institutionRecord)
@ -102,7 +102,7 @@ public interface InstitutionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default int insertSelective(InstitutionRecord record) { default int insertSelective(InstitutionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(institutionRecord) .into(institutionRecord)
@ -114,19 +114,19 @@ public interface InstitutionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage) return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage)
.from(institutionRecord); .from(institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage)
.from(institutionRecord); .from(institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default InstitutionRecord selectByPrimaryKey(Long id_) { default InstitutionRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, active, logoImage) return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, active, logoImage)
.from(institutionRecord) .from(institutionRecord)
@ -135,7 +135,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(InstitutionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -144,7 +144,7 @@ public interface InstitutionRecordMapper {
.set(logoImage).equalTo(record::getLogoImage); .set(logoImage).equalTo(record::getLogoImage);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(InstitutionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)
@ -153,7 +153,7 @@ public interface InstitutionRecordMapper {
.set(logoImage).equalToWhenPresent(record::getLogoImage); .set(logoImage).equalToWhenPresent(record::getLogoImage);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default int updateByPrimaryKey(InstitutionRecord record) { default int updateByPrimaryKey(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -165,7 +165,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.910+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.697+01:00", comments="Source Table: institution")
default int updateByPrimaryKeySelective(InstitutionRecord record) { default int updateByPrimaryKeySelective(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)

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

@ -6,43 +6,43 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class LmsSetupRecordDynamicSqlSupport { public final class LmsSetupRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.914+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source Table: lms_setup")
public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord(); public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.914+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.id")
public static final SqlColumn<Long> id = lmsSetupRecord.id; public static final SqlColumn<Long> id = lmsSetupRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.914+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.institution_id")
public static final SqlColumn<Long> institutionId = lmsSetupRecord.institutionId; public static final SqlColumn<Long> institutionId = lmsSetupRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.915+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.name")
public static final SqlColumn<String> name = lmsSetupRecord.name; public static final SqlColumn<String> name = lmsSetupRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.915+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.lms_type")
public static final SqlColumn<String> lmsType = lmsSetupRecord.lmsType; public static final SqlColumn<String> lmsType = lmsSetupRecord.lmsType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.915+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.lms_url")
public static final SqlColumn<String> lmsUrl = lmsSetupRecord.lmsUrl; public static final SqlColumn<String> lmsUrl = lmsSetupRecord.lmsUrl;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.917+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.lms_clientname")
public static final SqlColumn<String> lmsClientname = lmsSetupRecord.lmsClientname; public static final SqlColumn<String> lmsClientname = lmsSetupRecord.lmsClientname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.917+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.lms_clientsecret")
public static final SqlColumn<String> lmsClientsecret = lmsSetupRecord.lmsClientsecret; public static final SqlColumn<String> lmsClientsecret = lmsSetupRecord.lmsClientsecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.917+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.lms_rest_api_token")
public static final SqlColumn<String> lmsRestApiToken = lmsSetupRecord.lmsRestApiToken; public static final SqlColumn<String> lmsRestApiToken = lmsSetupRecord.lmsRestApiToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.917+01:00", comments="Source field: lms_setup.seb_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.seb_clientname")
public static final SqlColumn<String> sebClientname = lmsSetupRecord.sebClientname; public static final SqlColumn<String> sebClientname = lmsSetupRecord.sebClientname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.917+01:00", comments="Source field: lms_setup.seb_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.seb_clientsecret")
public static final SqlColumn<String> sebClientsecret = lmsSetupRecord.sebClientsecret; public static final SqlColumn<String> sebClientsecret = lmsSetupRecord.sebClientsecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.917+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source field: lms_setup.active")
public static final SqlColumn<Integer> active = lmsSetupRecord.active; public static final SqlColumn<Integer> active = lmsSetupRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.914+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source Table: lms_setup")
public static final class LmsSetupRecord extends SqlTable { public static final class LmsSetupRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface LmsSetupRecordMapper { public interface LmsSetupRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.917+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.700+01:00", comments="Source Table: lms_setup")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.917+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<LmsSetupRecord> insertStatement); int insert(InsertStatementProvider<LmsSetupRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -62,7 +62,7 @@ public interface LmsSetupRecordMapper {
}) })
LmsSetupRecord selectOne(SelectStatementProvider selectStatement); LmsSetupRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -79,22 +79,22 @@ public interface LmsSetupRecordMapper {
}) })
List<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement); List<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(lmsSetupRecord); .from(lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord); return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord) return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -102,7 +102,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default int insert(LmsSetupRecord record) { default int insert(LmsSetupRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(lmsSetupRecord) .into(lmsSetupRecord)
@ -120,7 +120,7 @@ public interface LmsSetupRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default int insertSelective(LmsSetupRecord record) { default int insertSelective(LmsSetupRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(lmsSetupRecord) .into(lmsSetupRecord)
@ -138,19 +138,19 @@ public interface LmsSetupRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active)
.from(lmsSetupRecord); .from(lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active)
.from(lmsSetupRecord); .from(lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.918+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default LmsSetupRecord selectByPrimaryKey(Long id_) { default LmsSetupRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active)
.from(lmsSetupRecord) .from(lmsSetupRecord)
@ -159,7 +159,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.919+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(LmsSetupRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -174,7 +174,7 @@ public interface LmsSetupRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.919+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(LmsSetupRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -189,7 +189,7 @@ public interface LmsSetupRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.919+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default int updateByPrimaryKey(LmsSetupRecord record) { default int updateByPrimaryKey(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -207,7 +207,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.919+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.701+01:00", comments="Source Table: lms_setup")
default int updateByPrimaryKeySelective(LmsSetupRecord record) { default int updateByPrimaryKeySelective(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class OrientationRecordDynamicSqlSupport { public final class OrientationRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.843+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source Table: orientation")
public static final OrientationRecord orientationRecord = new OrientationRecord(); public static final OrientationRecord orientationRecord = new OrientationRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.844+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source field: orientation.id")
public static final SqlColumn<Long> id = orientationRecord.id; public static final SqlColumn<Long> id = orientationRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.844+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source field: orientation.config_attribute_id")
public static final SqlColumn<Long> configAttributeId = orientationRecord.configAttributeId; public static final SqlColumn<Long> configAttributeId = orientationRecord.configAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.844+01:00", comments="Source field: orientation.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source field: orientation.template")
public static final SqlColumn<String> template = orientationRecord.template; public static final SqlColumn<String> template = orientationRecord.template;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.845+01:00", comments="Source field: orientation.view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source field: orientation.view")
public static final SqlColumn<String> view = orientationRecord.view; public static final SqlColumn<String> view = orientationRecord.view;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.845+01:00", comments="Source field: orientation.group") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source field: orientation.group")
public static final SqlColumn<String> group = orientationRecord.group; public static final SqlColumn<String> group = orientationRecord.group;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.845+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.654+01:00", comments="Source field: orientation.x_position")
public static final SqlColumn<Integer> xPosition = orientationRecord.xPosition; public static final SqlColumn<Integer> xPosition = orientationRecord.xPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.846+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.654+01:00", comments="Source field: orientation.y_position")
public static final SqlColumn<Integer> yPosition = orientationRecord.yPosition; public static final SqlColumn<Integer> yPosition = orientationRecord.yPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.846+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.654+01:00", comments="Source field: orientation.width")
public static final SqlColumn<Integer> width = orientationRecord.width; public static final SqlColumn<Integer> width = orientationRecord.width;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.846+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.654+01:00", comments="Source field: orientation.height")
public static final SqlColumn<Integer> height = orientationRecord.height; public static final SqlColumn<Integer> height = orientationRecord.height;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.843+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.653+01:00", comments="Source Table: orientation")
public static final class OrientationRecord extends SqlTable { public static final class OrientationRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface OrientationRecordMapper { public interface OrientationRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.847+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.847+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.847+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<OrientationRecord> insertStatement); int insert(InsertStatementProvider<OrientationRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.847+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -60,7 +60,7 @@ public interface OrientationRecordMapper {
}) })
OrientationRecord selectOne(SelectStatementProvider selectStatement); OrientationRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.847+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -75,22 +75,22 @@ public interface OrientationRecordMapper {
}) })
List<OrientationRecord> selectMany(SelectStatementProvider selectStatement); List<OrientationRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.847+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.847+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(orientationRecord); .from(orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.847+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.655+01:00", comments="Source Table: orientation")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.848+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord) return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -98,7 +98,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.848+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation")
default int insert(OrientationRecord record) { default int insert(OrientationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(orientationRecord) .into(orientationRecord)
@ -114,7 +114,7 @@ public interface OrientationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.848+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation")
default int insertSelective(OrientationRecord record) { default int insertSelective(OrientationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(orientationRecord) .into(orientationRecord)
@ -130,19 +130,19 @@ public interface OrientationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.849+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
.from(orientationRecord); .from(orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.849+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
.from(orientationRecord); .from(orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.849+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation")
default OrientationRecord selectByPrimaryKey(Long id_) { default OrientationRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
.from(orientationRecord) .from(orientationRecord)
@ -151,7 +151,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.850+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.656+01:00", comments="Source Table: orientation")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalTo(record::getConfigAttributeId) .set(configAttributeId).equalTo(record::getConfigAttributeId)
@ -164,7 +164,7 @@ public interface OrientationRecordMapper {
.set(height).equalTo(record::getHeight); .set(height).equalTo(record::getHeight);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.850+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.657+01:00", comments="Source Table: orientation")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)
@ -177,7 +177,7 @@ public interface OrientationRecordMapper {
.set(height).equalToWhenPresent(record::getHeight); .set(height).equalToWhenPresent(record::getHeight);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.850+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.657+01:00", comments="Source Table: orientation")
default int updateByPrimaryKey(OrientationRecord record) { default int updateByPrimaryKey(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalTo(record::getConfigAttributeId) .set(configAttributeId).equalTo(record::getConfigAttributeId)
@ -193,7 +193,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.850+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.657+01:00", comments="Source Table: orientation")
default int updateByPrimaryKeySelective(OrientationRecord record) { default int updateByPrimaryKeySelective(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)

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

@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class RoleRecordDynamicSqlSupport { public final class RoleRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.927+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source Table: user_role")
public static final RoleRecord roleRecord = new RoleRecord(); public static final RoleRecord roleRecord = new RoleRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.928+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.id")
public static final SqlColumn<Long> id = roleRecord.id; public static final SqlColumn<Long> id = roleRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.928+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.user_id")
public static final SqlColumn<Long> userId = roleRecord.userId; public static final SqlColumn<Long> userId = roleRecord.userId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.928+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.role_name")
public static final SqlColumn<String> roleName = roleRecord.roleName; public static final SqlColumn<String> roleName = roleRecord.roleName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.928+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source Table: user_role")
public static final class RoleRecord extends SqlTable { public static final class RoleRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

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

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

@ -7,22 +7,22 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ThresholdRecordDynamicSqlSupport { public final class ThresholdRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.906+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source Table: threshold")
public static final ThresholdRecord thresholdRecord = new ThresholdRecord(); public static final ThresholdRecord thresholdRecord = new ThresholdRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.906+01:00", comments="Source field: threshold.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.id")
public static final SqlColumn<Long> id = thresholdRecord.id; public static final SqlColumn<Long> id = thresholdRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.906+01:00", comments="Source field: threshold.indicator_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.indicator_id")
public static final SqlColumn<Long> indicatorId = thresholdRecord.indicatorId; public static final SqlColumn<Long> indicatorId = thresholdRecord.indicatorId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.906+01:00", comments="Source field: threshold.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.value")
public static final SqlColumn<BigDecimal> value = thresholdRecord.value; public static final SqlColumn<BigDecimal> value = thresholdRecord.value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.906+01:00", comments="Source field: threshold.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.color")
public static final SqlColumn<String> color = thresholdRecord.color; public static final SqlColumn<String> color = thresholdRecord.color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.906+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source Table: threshold")
public static final class ThresholdRecord extends SqlTable { public static final class ThresholdRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

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

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

@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class UserActivityLogRecordDynamicSqlSupport { public final class UserActivityLogRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source Table: user_activity_log")
public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord(); public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.id")
public static final SqlColumn<Long> id = userActivityLogRecord.id; public static final SqlColumn<Long> id = userActivityLogRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.user_uuid")
public static final SqlColumn<String> userUuid = userActivityLogRecord.userUuid; public static final SqlColumn<String> userUuid = userActivityLogRecord.userUuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.timestamp")
public static final SqlColumn<Long> timestamp = userActivityLogRecord.timestamp; public static final SqlColumn<Long> timestamp = userActivityLogRecord.timestamp;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.activity_type")
public static final SqlColumn<String> activityType = userActivityLogRecord.activityType; public static final SqlColumn<String> activityType = userActivityLogRecord.activityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.715+01:00", comments="Source field: user_activity_log.entity_type")
public static final SqlColumn<String> entityType = userActivityLogRecord.entityType; public static final SqlColumn<String> entityType = userActivityLogRecord.entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.715+01:00", comments="Source field: user_activity_log.entity_id")
public static final SqlColumn<String> entityId = userActivityLogRecord.entityId; public static final SqlColumn<String> entityId = userActivityLogRecord.entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.715+01:00", comments="Source field: user_activity_log.message")
public static final SqlColumn<String> message = userActivityLogRecord.message; public static final SqlColumn<String> message = userActivityLogRecord.message;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source Table: user_activity_log")
public static final class UserActivityLogRecord extends SqlTable { public static final class UserActivityLogRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

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

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

@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class UserRecordDynamicSqlSupport { public final class UserRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source Table: user")
public static final UserRecord userRecord = new UserRecord(); public static final UserRecord userRecord = new UserRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.id")
public static final SqlColumn<Long> id = userRecord.id; public static final SqlColumn<Long> id = userRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.institution_id")
public static final SqlColumn<Long> institutionId = userRecord.institutionId; public static final SqlColumn<Long> institutionId = userRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.uuid")
public static final SqlColumn<String> uuid = userRecord.uuid; public static final SqlColumn<String> uuid = userRecord.uuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.name")
public static final SqlColumn<String> name = userRecord.name; public static final SqlColumn<String> name = userRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source field: user.username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.username")
public static final SqlColumn<String> username = userRecord.username; public static final SqlColumn<String> username = userRecord.username;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.password")
public static final SqlColumn<String> password = userRecord.password; public static final SqlColumn<String> password = userRecord.password;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.email")
public static final SqlColumn<String> email = userRecord.email; public static final SqlColumn<String> email = userRecord.email;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source field: user.locale") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.language")
public static final SqlColumn<String> locale = userRecord.locale; public static final SqlColumn<String> language = userRecord.language;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source field: user.timezone")
public static final SqlColumn<String> timezone = userRecord.timezone; public static final SqlColumn<String> timezone = userRecord.timezone;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source field: user.active")
public static final SqlColumn<Integer> active = userRecord.active; public static final SqlColumn<Integer> active = userRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source Table: user")
public static final class UserRecord extends SqlTable { public static final class UserRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
@ -55,7 +55,7 @@ public final class UserRecordDynamicSqlSupport {
public final SqlColumn<String> email = column("email", JDBCType.VARCHAR); public final SqlColumn<String> email = column("email", JDBCType.VARCHAR);
public final SqlColumn<String> locale = column("locale", JDBCType.VARCHAR); public final SqlColumn<String> language = column("language", JDBCType.VARCHAR);
public final SqlColumn<String> timezone = column("timezone", JDBCType.VARCHAR); public final SqlColumn<String> timezone = column("timezone", JDBCType.VARCHAR);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface UserRecordMapper { public interface UserRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.923+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
long count(SelectStatementProvider selectStatement); long count(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
@DeleteProvider(type=SqlProviderAdapter.class, method="delete") @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
int delete(DeleteStatementProvider deleteStatement); int delete(DeleteStatementProvider deleteStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<UserRecord> insertStatement); int insert(InsertStatementProvider<UserRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -55,13 +55,13 @@ public interface UserRecordMapper {
@Arg(column="username", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="username", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="password", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="password", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="email", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="email", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="locale", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="language", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="timezone", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="timezone", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER) @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER)
}) })
UserRecord selectOne(SelectStatementProvider selectStatement); UserRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -71,28 +71,28 @@ public interface UserRecordMapper {
@Arg(column="username", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="username", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="password", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="password", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="email", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="email", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="locale", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="language", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="timezone", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="timezone", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER) @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER)
}) })
List<UserRecord> selectMany(SelectStatementProvider selectStatement); List<UserRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
@UpdateProvider(type=SqlProviderAdapter.class, method="update") @UpdateProvider(type=SqlProviderAdapter.class, method="update")
int update(UpdateStatementProvider updateStatement); int update(UpdateStatementProvider updateStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
.from(userRecord); .from(userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); return DeleteDSL.deleteFromWithMapper(this::delete, userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, userRecord) return DeleteDSL.deleteFromWithMapper(this::delete, userRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -100,7 +100,7 @@ public interface UserRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
default int insert(UserRecord record) { default int insert(UserRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(userRecord) .into(userRecord)
@ -110,14 +110,14 @@ public interface UserRecordMapper {
.map(username).toProperty("username") .map(username).toProperty("username")
.map(password).toProperty("password") .map(password).toProperty("password")
.map(email).toProperty("email") .map(email).toProperty("email")
.map(locale).toProperty("locale") .map(language).toProperty("language")
.map(timezone).toProperty("timezone") .map(timezone).toProperty("timezone")
.map(active).toProperty("active") .map(active).toProperty("active")
.build() .build()
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
default int insertSelective(UserRecord record) { default int insertSelective(UserRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(userRecord) .into(userRecord)
@ -127,35 +127,35 @@ public interface UserRecordMapper {
.map(username).toPropertyWhenPresent("username", record::getUsername) .map(username).toPropertyWhenPresent("username", record::getUsername)
.map(password).toPropertyWhenPresent("password", record::getPassword) .map(password).toPropertyWhenPresent("password", record::getPassword)
.map(email).toPropertyWhenPresent("email", record::getEmail) .map(email).toPropertyWhenPresent("email", record::getEmail)
.map(locale).toPropertyWhenPresent("locale", record::getLocale) .map(language).toPropertyWhenPresent("language", record::getLanguage)
.map(timezone).toPropertyWhenPresent("timezone", record::getTimezone) .map(timezone).toPropertyWhenPresent("timezone", record::getTimezone)
.map(active).toPropertyWhenPresent("active", record::getActive) .map(active).toPropertyWhenPresent("active", record::getActive)
.build() .build()
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, locale, timezone, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active)
.from(userRecord); .from(userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.924+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, locale, timezone, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active)
.from(userRecord); .from(userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.925+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
default UserRecord selectByPrimaryKey(Long id_) { default UserRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, username, password, email, locale, timezone, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, username, password, email, language, timezone, active)
.from(userRecord) .from(userRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
.build() .build()
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.925+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(UserRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(UserRecord record) {
return UpdateDSL.updateWithMapper(this::update, userRecord) return UpdateDSL.updateWithMapper(this::update, userRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -164,12 +164,12 @@ public interface UserRecordMapper {
.set(username).equalTo(record::getUsername) .set(username).equalTo(record::getUsername)
.set(password).equalTo(record::getPassword) .set(password).equalTo(record::getPassword)
.set(email).equalTo(record::getEmail) .set(email).equalTo(record::getEmail)
.set(locale).equalTo(record::getLocale) .set(language).equalTo(record::getLanguage)
.set(timezone).equalTo(record::getTimezone) .set(timezone).equalTo(record::getTimezone)
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.925+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.708+01:00", comments="Source Table: user")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(UserRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(UserRecord record) {
return UpdateDSL.updateWithMapper(this::update, userRecord) return UpdateDSL.updateWithMapper(this::update, userRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -178,12 +178,12 @@ public interface UserRecordMapper {
.set(username).equalToWhenPresent(record::getUsername) .set(username).equalToWhenPresent(record::getUsername)
.set(password).equalToWhenPresent(record::getPassword) .set(password).equalToWhenPresent(record::getPassword)
.set(email).equalToWhenPresent(record::getEmail) .set(email).equalToWhenPresent(record::getEmail)
.set(locale).equalToWhenPresent(record::getLocale) .set(language).equalToWhenPresent(record::getLanguage)
.set(timezone).equalToWhenPresent(record::getTimezone) .set(timezone).equalToWhenPresent(record::getTimezone)
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.925+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.709+01:00", comments="Source Table: user")
default int updateByPrimaryKey(UserRecord record) { default int updateByPrimaryKey(UserRecord record) {
return UpdateDSL.updateWithMapper(this::update, userRecord) return UpdateDSL.updateWithMapper(this::update, userRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -192,7 +192,7 @@ public interface UserRecordMapper {
.set(username).equalTo(record::getUsername) .set(username).equalTo(record::getUsername)
.set(password).equalTo(record::getPassword) .set(password).equalTo(record::getPassword)
.set(email).equalTo(record::getEmail) .set(email).equalTo(record::getEmail)
.set(locale).equalTo(record::getLocale) .set(language).equalTo(record::getLanguage)
.set(timezone).equalTo(record::getTimezone) .set(timezone).equalTo(record::getTimezone)
.set(active).equalTo(record::getActive) .set(active).equalTo(record::getActive)
.where(id, isEqualTo(record::getId)) .where(id, isEqualTo(record::getId))
@ -200,7 +200,7 @@ public interface UserRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.925+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.709+01:00", comments="Source Table: user")
default int updateByPrimaryKeySelective(UserRecord record) { default int updateByPrimaryKeySelective(UserRecord record) {
return UpdateDSL.updateWithMapper(this::update, userRecord) return UpdateDSL.updateWithMapper(this::update, userRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -209,7 +209,7 @@ public interface UserRecordMapper {
.set(username).equalToWhenPresent(record::getUsername) .set(username).equalToWhenPresent(record::getUsername)
.set(password).equalToWhenPresent(record::getPassword) .set(password).equalToWhenPresent(record::getPassword)
.set(email).equalToWhenPresent(record::getEmail) .set(email).equalToWhenPresent(record::getEmail)
.set(locale).equalToWhenPresent(record::getLocale) .set(language).equalToWhenPresent(record::getLanguage)
.set(timezone).equalToWhenPresent(record::getTimezone) .set(timezone).equalToWhenPresent(record::getTimezone)
.set(active).equalToWhenPresent(record::getActive) .set(active).equalToWhenPresent(record::getActive)
.where(id, isEqualTo(record::getId)) .where(id, isEqualTo(record::getId))

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

@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class AdditionalAttributes { public class AdditionalAttributes {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source field: additional_attributes.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source field: additional_attributes.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.entity_type")
private String entityType; private String entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source field: additional_attributes.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.entity_id")
private Long entityId; private Long entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source field: additional_attributes.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source field: additional_attributes.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.value")
private String value; private String value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source Table: additional_attributes")
public AdditionalAttributes(Long id, String entityType, Long entityId, String name, String value) { public AdditionalAttributes(Long id, String entityType, Long entityId, String name, String value) {
this.id = id; this.id = id;
this.entityType = entityType; this.entityType = entityType;
@ -27,27 +27,27 @@ public class AdditionalAttributes {
this.value = value; this.value = value;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source field: additional_attributes.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source field: additional_attributes.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.entity_type")
public String getEntityType() { public String getEntityType() {
return entityType; return entityType;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source field: additional_attributes.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.entity_id")
public Long getEntityId() { public Long getEntityId() {
return entityId; return entityId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source field: additional_attributes.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.934+01:00", comments="Source field: additional_attributes.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.716+01:00", comments="Source field: additional_attributes.value")
public String getValue() { public String getValue() {
return value; return value;
} }
@ -56,7 +56,7 @@ public class AdditionalAttributes {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table additional_attributes * This method corresponds to the database table additional_attributes
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class AdditionalAttributes {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table additional_attributes * This method corresponds to the database table additional_attributes
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class AdditionalAttributes {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table additional_attributes * This method corresponds to the database table additional_attributes
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ClientConnectionRecord { public class ClientConnectionRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.891+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source field: client_connection.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.891+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.891+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.status")
private String status; private String status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.892+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.connection_token")
private String connectionToken; private String connectionToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.892+01:00", comments="Source field: client_connection.user_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.user_name")
private String userName; private String userName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.892+01:00", comments="Source field: client_connection.vdi") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.vdi")
private Boolean vdi; private Boolean vdi;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.892+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.client_address")
private String clientAddress; private String clientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.892+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.virtual_client_address")
private String virtualClientAddress; private String virtualClientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.891+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source Table: client_connection")
public ClientConnectionRecord(Long id, Long examId, String status, String connectionToken, String userName, Boolean vdi, String clientAddress, String virtualClientAddress) { public ClientConnectionRecord(Long id, Long examId, String status, String connectionToken, String userName, Boolean vdi, String clientAddress, String virtualClientAddress) {
this.id = id; this.id = id;
this.examId = examId; this.examId = examId;
@ -39,42 +39,42 @@ public class ClientConnectionRecord {
this.virtualClientAddress = virtualClientAddress; this.virtualClientAddress = virtualClientAddress;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.891+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.685+01:00", comments="Source field: client_connection.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.891+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.exam_id")
public Long getExamId() { public Long getExamId() {
return examId; return examId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.892+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.status")
public String getStatus() { public String getStatus() {
return status; return status;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.892+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.connection_token")
public String getConnectionToken() { public String getConnectionToken() {
return connectionToken; return connectionToken;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.892+01:00", comments="Source field: client_connection.user_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.user_name")
public String getUserName() { public String getUserName() {
return userName; return userName;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.892+01:00", comments="Source field: client_connection.vdi") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.vdi")
public Boolean getVdi() { public Boolean getVdi() {
return vdi; return vdi;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.892+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.client_address")
public String getClientAddress() { public String getClientAddress() {
return clientAddress; return clientAddress;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.893+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.686+01:00", comments="Source field: client_connection.virtual_client_address")
public String getVirtualClientAddress() { public String getVirtualClientAddress() {
return virtualClientAddress; return virtualClientAddress;
} }
@ -83,7 +83,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -107,7 +107,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -135,7 +135,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -4,28 +4,28 @@ import java.math.BigDecimal;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ClientEventRecord { public class ClientEventRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.897+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.897+01:00", comments="Source field: client_event.connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.connection_id")
private Long connectionId; private Long connectionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.897+01:00", comments="Source field: client_event.user_identifier") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.user_identifier")
private String userIdentifier; private String userIdentifier;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.type")
private Integer type; private Integer type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source field: client_event.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.timestamp")
private Long timestamp; private Long timestamp;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.numeric_value")
private BigDecimal numericValue; private BigDecimal numericValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.text")
private String text; private String text;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.897+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source Table: client_event")
public ClientEventRecord(Long id, Long connectionId, String userIdentifier, Integer type, Long timestamp, BigDecimal numericValue, String text) { public ClientEventRecord(Long id, Long connectionId, String userIdentifier, Integer type, Long timestamp, BigDecimal numericValue, String text) {
this.id = id; this.id = id;
this.connectionId = connectionId; this.connectionId = connectionId;
@ -36,37 +36,37 @@ public class ClientEventRecord {
this.text = text; this.text = text;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.897+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.897+01:00", comments="Source field: client_event.connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.connection_id")
public Long getConnectionId() { public Long getConnectionId() {
return connectionId; return connectionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.897+01:00", comments="Source field: client_event.user_identifier") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.user_identifier")
public String getUserIdentifier() { public String getUserIdentifier() {
return userIdentifier; return userIdentifier;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.type")
public Integer getType() { public Integer getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source field: client_event.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.timestamp")
public Long getTimestamp() { public Long getTimestamp() {
return timestamp; return timestamp;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.689+01:00", comments="Source field: client_event.numeric_value")
public BigDecimal getNumericValue() { public BigDecimal getNumericValue() {
return numericValue; return numericValue;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.898+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.690+01:00", comments="Source field: client_event.text")
public String getText() { public String getText() {
return text; return text;
} }
@ -75,7 +75,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -98,7 +98,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -125,7 +125,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ConfigurationAttributeRecord { public class ConfigurationAttributeRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.569+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.502+01:00", comments="Source field: configuration_attribute.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.570+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.570+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.571+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.parent_id")
private Long parentId; private Long parentId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.571+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.resources")
private String resources; private String resources;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.571+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.validator")
private String validator; private String validator;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.571+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.dependencies")
private String dependencies; private String dependencies;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.572+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.default_value")
private String defaultValue; private String defaultValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.561+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.496+01:00", comments="Source Table: configuration_attribute")
public ConfigurationAttributeRecord(Long id, String name, String type, Long parentId, String resources, String validator, String dependencies, String defaultValue) { public ConfigurationAttributeRecord(Long id, String name, String type, Long parentId, String resources, String validator, String dependencies, String defaultValue) {
this.id = id; this.id = id;
this.name = name; this.name = name;
@ -39,42 +39,42 @@ public class ConfigurationAttributeRecord {
this.defaultValue = defaultValue; this.defaultValue = defaultValue;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.570+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.570+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.571+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.type")
public String getType() { public String getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.571+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.503+01:00", comments="Source field: configuration_attribute.parent_id")
public Long getParentId() { public Long getParentId() {
return parentId; return parentId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.571+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.resources")
public String getResources() { public String getResources() {
return resources; return resources;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.571+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.validator")
public String getValidator() { public String getValidator() {
return validator; return validator;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.572+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.dependencies")
public String getDependencies() { public String getDependencies() {
return dependencies; return dependencies;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.572+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.504+01:00", comments="Source field: configuration_attribute.default_value")
public String getDefaultValue() { public String getDefaultValue() {
return defaultValue; return defaultValue;
} }
@ -83,7 +83,7 @@ public class ConfigurationAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_attribute * This method corresponds to the database table configuration_attribute
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -107,7 +107,7 @@ public class ConfigurationAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_attribute * This method corresponds to the database table configuration_attribute
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -135,7 +135,7 @@ public class ConfigurationAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_attribute * This method corresponds to the database table configuration_attribute
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ConfigurationNodeRecord { public class ConfigurationNodeRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.860+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source field: configuration_node.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.860+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.860+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.owner")
private String owner; private String owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.description")
private String description; private String description;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source field: configuration_node.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.template")
private String template; private String template;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source field: configuration_node.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.860+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source Table: configuration_node")
public ConfigurationNodeRecord(Long id, Long institutionId, String owner, String name, String description, String type, String template, Integer active) { public ConfigurationNodeRecord(Long id, Long institutionId, String owner, String name, String description, String type, String template, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -39,42 +39,42 @@ public class ConfigurationNodeRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.860+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.660+01:00", comments="Source field: configuration_node.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.860+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.860+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.owner")
public String getOwner() { public String getOwner() {
return owner; return owner;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.description")
public String getDescription() { public String getDescription() {
return description; return description;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.type")
public String getType() { public String getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source field: configuration_node.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.661+01:00", comments="Source field: configuration_node.template")
public String getTemplate() { public String getTemplate() {
return template; return template;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.861+01:00", comments="Source field: configuration_node.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.662+01:00", comments="Source field: configuration_node.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -83,7 +83,7 @@ public class ConfigurationNodeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_node * This method corresponds to the database table configuration_node
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -107,7 +107,7 @@ public class ConfigurationNodeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_node * This method corresponds to the database table configuration_node
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -135,7 +135,7 @@ public class ConfigurationNodeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_node * This method corresponds to the database table configuration_node
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -4,22 +4,22 @@ import javax.annotation.Generated;
import org.joda.time.DateTime; import org.joda.time.DateTime;
public class ConfigurationRecord { public class ConfigurationRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.852+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.852+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.configuration_node_id")
private Long configurationNodeId; private Long configurationNodeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.853+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.version")
private String version; private String version;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.854+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.version_date")
private DateTime versionDate; private DateTime versionDate;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.854+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.followup")
private Integer followup; private Integer followup;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.851+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source Table: configuration")
public ConfigurationRecord(Long id, Long configurationNodeId, String version, DateTime versionDate, Integer followup) { public ConfigurationRecord(Long id, Long configurationNodeId, String version, DateTime versionDate, Integer followup) {
this.id = id; this.id = id;
this.configurationNodeId = configurationNodeId; this.configurationNodeId = configurationNodeId;
@ -28,27 +28,27 @@ public class ConfigurationRecord {
this.followup = followup; this.followup = followup;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.852+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.852+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.configuration_node_id")
public Long getConfigurationNodeId() { public Long getConfigurationNodeId() {
return configurationNodeId; return configurationNodeId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.853+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.version")
public String getVersion() { public String getVersion() {
return version; return version;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.854+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.version_date")
public DateTime getVersionDate() { public DateTime getVersionDate() {
return versionDate; return versionDate;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.854+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.658+01:00", comments="Source field: configuration.followup")
public Integer getFollowup() { public Integer getFollowup() {
return followup; return followup;
} }
@ -57,7 +57,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -78,7 +78,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -103,7 +103,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ConfigurationValueRecord { public class ConfigurationValueRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.834+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.834+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.configuration_id")
private Long configurationId; private Long configurationId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.834+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.configuration_attribute_id")
private Long configurationAttributeId; private Long configurationAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.834+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.list_index")
private Integer listIndex; private Integer listIndex;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.835+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.value")
private String value; private String value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.835+01:00", comments="Source field: configuration_value.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.647+01:00", comments="Source field: configuration_value.text")
private String text; private String text;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.833+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source Table: configuration_value")
public ConfigurationValueRecord(Long id, Long configurationId, Long configurationAttributeId, Integer listIndex, String value, String text) { public ConfigurationValueRecord(Long id, Long configurationId, Long configurationAttributeId, Integer listIndex, String value, String text) {
this.id = id; this.id = id;
this.configurationId = configurationId; this.configurationId = configurationId;
@ -31,32 +31,32 @@ public class ConfigurationValueRecord {
this.text = text; this.text = text;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.834+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.834+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.configuration_id")
public Long getConfigurationId() { public Long getConfigurationId() {
return configurationId; return configurationId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.834+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.configuration_attribute_id")
public Long getConfigurationAttributeId() { public Long getConfigurationAttributeId() {
return configurationAttributeId; return configurationAttributeId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.835+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.644+01:00", comments="Source field: configuration_value.list_index")
public Integer getListIndex() { public Integer getListIndex() {
return listIndex; return listIndex;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.835+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.647+01:00", comments="Source field: configuration_value.value")
public String getValue() { public String getValue() {
return value; return value;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.835+01:00", comments="Source field: configuration_value.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.648+01:00", comments="Source field: configuration_value.text")
public String getText() { public String getText() {
return text; return text;
} }
@ -65,7 +65,7 @@ public class ConfigurationValueRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_value * This method corresponds to the database table configuration_value
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -87,7 +87,7 @@ public class ConfigurationValueRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_value * This method corresponds to the database table configuration_value
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -113,7 +113,7 @@ public class ConfigurationValueRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_value * This method corresponds to the database table configuration_value
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,19 +3,19 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ExamConfigurationMapRecord { public class ExamConfigurationMapRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.868+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.868+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.868+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
private Long configurationNodeId; private Long configurationNodeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.869+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.user_names")
private String userNames; private String userNames;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.868+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source Table: exam_configuration_map")
public ExamConfigurationMapRecord(Long id, Long examId, Long configurationNodeId, String userNames) { public ExamConfigurationMapRecord(Long id, Long examId, Long configurationNodeId, String userNames) {
this.id = id; this.id = id;
this.examId = examId; this.examId = examId;
@ -23,22 +23,22 @@ public class ExamConfigurationMapRecord {
this.userNames = userNames; this.userNames = userNames;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.868+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.868+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.exam_id")
public Long getExamId() { public Long getExamId() {
return examId; return examId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.869+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
public Long getConfigurationNodeId() { public Long getConfigurationNodeId() {
return configurationNodeId; return configurationNodeId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.869+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.666+01:00", comments="Source field: exam_configuration_map.user_names")
public String getUserNames() { public String getUserNames() {
return userNames; return userNames;
} }
@ -47,7 +47,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -67,7 +67,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -91,7 +91,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ExamRecord { public class ExamRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.885+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.885+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.885+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.lms_setup_id")
private Long lmsSetupId; private Long lmsSetupId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.885+01:00", comments="Source field: exam.external_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.external_id")
private String externalId; private String externalId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.owner")
private String owner; private String owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.supporter")
private String supporter; private String supporter;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.status")
private String status; private String status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.quit_password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.quit_password")
private String quitPassword; private String quitPassword;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.885+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source Table: exam")
public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String status, String quitPassword, Integer active) { public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String status, String quitPassword, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -47,52 +47,52 @@ public class ExamRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.885+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.885+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.885+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.lms_setup_id")
public Long getLmsSetupId() { public Long getLmsSetupId() {
return lmsSetupId; return lmsSetupId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.885+01:00", comments="Source field: exam.external_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.external_id")
public String getExternalId() { public String getExternalId() {
return externalId; return externalId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.681+01:00", comments="Source field: exam.owner")
public String getOwner() { public String getOwner() {
return owner; return owner;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.supporter")
public String getSupporter() { public String getSupporter() {
return supporter; return supporter;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.type")
public String getType() { public String getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.status")
public String getStatus() { public String getStatus() {
return status; return status;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.quit_password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.quit_password")
public String getQuitPassword() { public String getQuitPassword() {
return quitPassword; return quitPassword;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.886+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.682+01:00", comments="Source field: exam.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -101,7 +101,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -127,7 +127,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -157,7 +157,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class IndicatorRecord { public class IndicatorRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.902+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.902+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.color")
private String color; private String color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.902+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source Table: indicator")
public IndicatorRecord(Long id, Long examId, String type, String name, String color) { public IndicatorRecord(Long id, Long examId, String type, String name, String color) {
this.id = id; this.id = id;
this.examId = examId; this.examId = examId;
@ -27,27 +27,27 @@ public class IndicatorRecord {
this.color = color; this.color = color;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.902+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.902+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.exam_id")
public Long getExamId() { public Long getExamId() {
return examId; return examId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.type")
public String getType() { public String getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.903+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.692+01:00", comments="Source field: indicator.color")
public String getColor() { public String getColor() {
return color; return color;
} }
@ -56,7 +56,7 @@ public class IndicatorRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table indicator * This method corresponds to the database table indicator
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class IndicatorRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table indicator * This method corresponds to the database table indicator
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class IndicatorRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table indicator * This method corresponds to the database table indicator
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class InstitutionRecord { public class InstitutionRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.907+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source field: institution.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.907+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source field: institution.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.907+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source field: institution.url_suffix")
private String urlSuffix; private String urlSuffix;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.908+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.908+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.logo_image")
private String logoImage; private String logoImage;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.907+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source Table: institution")
public InstitutionRecord(Long id, String name, String urlSuffix, Integer active, String logoImage) { public InstitutionRecord(Long id, String name, String urlSuffix, Integer active, String logoImage) {
this.id = id; this.id = id;
this.name = name; this.name = name;
@ -27,27 +27,27 @@ public class InstitutionRecord {
this.logoImage = logoImage; this.logoImage = logoImage;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.907+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source field: institution.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.907+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.695+01:00", comments="Source field: institution.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.907+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.url_suffix")
public String getUrlSuffix() { public String getUrlSuffix() {
return urlSuffix; return urlSuffix;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.908+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.908+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.696+01:00", comments="Source field: institution.logo_image")
public String getLogoImage() { public String getLogoImage() {
return logoImage; return logoImage;
} }
@ -56,7 +56,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,40 +3,40 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class LmsSetupRecord { public class LmsSetupRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.lms_type")
private String lmsType; private String lmsType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.lms_url")
private String lmsUrl; private String lmsUrl;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.lms_clientname")
private String lmsClientname; private String lmsClientname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.913+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.lms_clientsecret")
private String lmsClientsecret; private String lmsClientsecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.913+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.lms_rest_api_token")
private String lmsRestApiToken; private String lmsRestApiToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.913+01:00", comments="Source field: lms_setup.seb_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.seb_clientname")
private String sebClientname; private String sebClientname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.913+01:00", comments="Source field: lms_setup.seb_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.seb_clientsecret")
private String sebClientsecret; private String sebClientsecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.914+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source Table: lms_setup")
public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String sebClientname, String sebClientsecret, Integer active) { public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String sebClientname, String sebClientsecret, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -51,57 +51,57 @@ public class LmsSetupRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.lms_type")
public String getLmsType() { public String getLmsType() {
return lmsType; return lmsType;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.912+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.698+01:00", comments="Source field: lms_setup.lms_url")
public String getLmsUrl() { public String getLmsUrl() {
return lmsUrl; return lmsUrl;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.913+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.lms_clientname")
public String getLmsClientname() { public String getLmsClientname() {
return lmsClientname; return lmsClientname;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.913+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.lms_clientsecret")
public String getLmsClientsecret() { public String getLmsClientsecret() {
return lmsClientsecret; return lmsClientsecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.913+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.lms_rest_api_token")
public String getLmsRestApiToken() { public String getLmsRestApiToken() {
return lmsRestApiToken; return lmsRestApiToken;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.913+01:00", comments="Source field: lms_setup.seb_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.seb_clientname")
public String getSebClientname() { public String getSebClientname() {
return sebClientname; return sebClientname;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.913+01:00", comments="Source field: lms_setup.seb_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.seb_clientsecret")
public String getSebClientsecret() { public String getSebClientsecret() {
return sebClientsecret; return sebClientsecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.914+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.699+01:00", comments="Source field: lms_setup.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -110,7 +110,7 @@ public class LmsSetupRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table lms_setup * This method corresponds to the database table lms_setup
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -137,7 +137,7 @@ public class LmsSetupRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table lms_setup * This method corresponds to the database table lms_setup
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -168,7 +168,7 @@ public class LmsSetupRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table lms_setup * This method corresponds to the database table lms_setup
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class OrientationRecord { public class OrientationRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.840+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source field: orientation.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.840+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source field: orientation.config_attribute_id")
private Long configAttributeId; private Long configAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.840+01:00", comments="Source field: orientation.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source field: orientation.template")
private String template; private String template;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.841+01:00", comments="Source field: orientation.view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.view")
private String view; private String view;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.841+01:00", comments="Source field: orientation.group") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.group")
private String group; private String group;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.841+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.x_position")
private Integer xPosition; private Integer xPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.842+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.y_position")
private Integer yPosition; private Integer yPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.842+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.width")
private Integer width; private Integer width;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.842+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.height")
private Integer height; private Integer height;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.840+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source Table: orientation")
public OrientationRecord(Long id, Long configAttributeId, String template, String view, String group, Integer xPosition, Integer yPosition, Integer width, Integer height) { public OrientationRecord(Long id, Long configAttributeId, String template, String view, String group, Integer xPosition, Integer yPosition, Integer width, Integer height) {
this.id = id; this.id = id;
this.configAttributeId = configAttributeId; this.configAttributeId = configAttributeId;
@ -43,47 +43,47 @@ public class OrientationRecord {
this.height = height; this.height = height;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.840+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source field: orientation.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.840+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.651+01:00", comments="Source field: orientation.config_attribute_id")
public Long getConfigAttributeId() { public Long getConfigAttributeId() {
return configAttributeId; return configAttributeId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.840+01:00", comments="Source field: orientation.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.template")
public String getTemplate() { public String getTemplate() {
return template; return template;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.841+01:00", comments="Source field: orientation.view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.view")
public String getView() { public String getView() {
return view; return view;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.841+01:00", comments="Source field: orientation.group") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.group")
public String getGroup() { public String getGroup() {
return group; return group;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.842+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.x_position")
public Integer getxPosition() { public Integer getxPosition() {
return xPosition; return xPosition;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.842+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.y_position")
public Integer getyPosition() { public Integer getyPosition() {
return yPosition; return yPosition;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.842+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.width")
public Integer getWidth() { public Integer getWidth() {
return width; return width;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.842+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.652+01:00", comments="Source field: orientation.height")
public Integer getHeight() { public Integer getHeight() {
return height; return height;
} }
@ -92,7 +92,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -117,7 +117,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -146,7 +146,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,33 +3,33 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class RoleRecord { public class RoleRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.927+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.710+01:00", comments="Source field: user_role.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.927+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.user_id")
private Long userId; private Long userId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.927+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.role_name")
private String roleName; private String roleName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.927+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.710+01:00", comments="Source Table: user_role")
public RoleRecord(Long id, Long userId, String roleName) { public RoleRecord(Long id, Long userId, String roleName) {
this.id = id; this.id = id;
this.userId = userId; this.userId = userId;
this.roleName = roleName; this.roleName = roleName;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.927+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.927+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.user_id")
public Long getUserId() { public Long getUserId() {
return userId; return userId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.927+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.711+01:00", comments="Source field: user_role.role_name")
public String getRoleName() { public String getRoleName() {
return roleName; return roleName;
} }
@ -38,7 +38,7 @@ public class RoleRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_role * This method corresponds to the database table user_role
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -57,7 +57,7 @@ public class RoleRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_role * This method corresponds to the database table user_role
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -80,7 +80,7 @@ public class RoleRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_role * This method corresponds to the database table user_role
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -4,19 +4,19 @@ import java.math.BigDecimal;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ThresholdRecord { public class ThresholdRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.905+01:00", comments="Source field: threshold.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.905+01:00", comments="Source field: threshold.indicator_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.indicator_id")
private Long indicatorId; private Long indicatorId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.905+01:00", comments="Source field: threshold.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.value")
private BigDecimal value; private BigDecimal value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.905+01:00", comments="Source field: threshold.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.color")
private String color; private String color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.905+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source Table: threshold")
public ThresholdRecord(Long id, Long indicatorId, BigDecimal value, String color) { public ThresholdRecord(Long id, Long indicatorId, BigDecimal value, String color) {
this.id = id; this.id = id;
this.indicatorId = indicatorId; this.indicatorId = indicatorId;
@ -24,22 +24,22 @@ public class ThresholdRecord {
this.color = color; this.color = color;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.905+01:00", comments="Source field: threshold.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.905+01:00", comments="Source field: threshold.indicator_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.indicator_id")
public Long getIndicatorId() { public Long getIndicatorId() {
return indicatorId; return indicatorId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.905+01:00", comments="Source field: threshold.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.value")
public BigDecimal getValue() { public BigDecimal getValue() {
return value; return value;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.905+01:00", comments="Source field: threshold.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.694+01:00", comments="Source field: threshold.color")
public String getColor() { public String getColor() {
return color; return color;
} }
@ -48,7 +48,7 @@ public class ThresholdRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table threshold * This method corresponds to the database table threshold
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -68,7 +68,7 @@ public class ThresholdRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table threshold * This method corresponds to the database table threshold
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -92,7 +92,7 @@ public class ThresholdRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table threshold * This method corresponds to the database table threshold
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,28 +3,28 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class UserActivityLogRecord { public class UserActivityLogRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.user_uuid")
private String userUuid; private String userUuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.timestamp")
private Long timestamp; private Long timestamp;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.activity_type")
private String activityType; private String activityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.entity_type")
private String entityType; private String entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.entity_id")
private String entityId; private String entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.message")
private String message; private String message;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source Table: user_activity_log")
public UserActivityLogRecord(Long id, String userUuid, Long timestamp, String activityType, String entityType, String entityId, String message) { public UserActivityLogRecord(Long id, String userUuid, Long timestamp, String activityType, String entityType, String entityId, String message) {
this.id = id; this.id = id;
this.userUuid = userUuid; this.userUuid = userUuid;
@ -35,37 +35,37 @@ public class UserActivityLogRecord {
this.message = message; this.message = message;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.user_uuid")
public String getUserUuid() { public String getUserUuid() {
return userUuid; return userUuid;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.timestamp")
public Long getTimestamp() { public Long getTimestamp() {
return timestamp; return timestamp;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.activity_type")
public String getActivityType() { public String getActivityType() {
return activityType; return activityType;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.930+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.entity_type")
public String getEntityType() { public String getEntityType() {
return entityType; return entityType;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.entity_id")
public String getEntityId() { public String getEntityId() {
return entityId; return entityId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.931+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.714+01:00", comments="Source field: user_activity_log.message")
public String getMessage() { public String getMessage() {
return message; return message;
} }
@ -74,7 +74,7 @@ public class UserActivityLogRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_activity_log * This method corresponds to the database table user_activity_log
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -97,7 +97,7 @@ public class UserActivityLogRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_activity_log * This method corresponds to the database table user_activity_log
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -124,7 +124,7 @@ public class UserActivityLogRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_activity_log * This method corresponds to the database table user_activity_log
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,38 +3,38 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class UserRecord { public class UserRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.921+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.921+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.uuid")
private String uuid; private String uuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.username")
private String username; private String username;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.password")
private String password; private String password;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.email")
private String email; private String email;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.locale") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.language")
private String locale; private String language;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.timezone")
private String timezone; private String timezone;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.921+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.704+01:00", comments="Source Table: user")
public UserRecord(Long id, Long institutionId, String uuid, String name, String username, String password, String email, String locale, String timezone, Integer active) { public UserRecord(Long id, Long institutionId, String uuid, String name, String username, String password, String email, String language, String timezone, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
this.uuid = uuid; this.uuid = uuid;
@ -42,57 +42,57 @@ public class UserRecord {
this.username = username; this.username = username;
this.password = password; this.password = password;
this.email = email; this.email = email;
this.locale = locale; this.language = language;
this.timezone = timezone; this.timezone = timezone;
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.921+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.uuid")
public String getUuid() { public String getUuid() {
return uuid; return uuid;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.705+01:00", comments="Source field: user.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.username")
public String getUsername() { public String getUsername() {
return username; return username;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.password")
public String getPassword() { public String getPassword() {
return password; return password;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.email")
public String getEmail() { public String getEmail() {
return email; return email;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.locale") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.language")
public String getLocale() { public String getLanguage() {
return locale; return language;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.706+01:00", comments="Source field: user.timezone")
public String getTimezone() { public String getTimezone() {
return timezone; return timezone;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-13T15:21:36.922+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-02-25T10:55:53.707+01:00", comments="Source field: user.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -101,7 +101,7 @@ public class UserRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user * This method corresponds to the database table user
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public String toString() { public String toString() {
@ -116,7 +116,7 @@ public class UserRecord {
sb.append(", username=").append(username); sb.append(", username=").append(username);
sb.append(", password=").append(password); sb.append(", password=").append(password);
sb.append(", email=").append(email); sb.append(", email=").append(email);
sb.append(", locale=").append(locale); sb.append(", language=").append(language);
sb.append(", timezone=").append(timezone); sb.append(", timezone=").append(timezone);
sb.append(", active=").append(active); sb.append(", active=").append(active);
sb.append("]"); sb.append("]");
@ -127,7 +127,7 @@ public class UserRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user * This method corresponds to the database table user
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -148,7 +148,7 @@ public class UserRecord {
&& (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername())) && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername()))
&& (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword())) && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
&& (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail())) && (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail()))
&& (this.getLocale() == null ? other.getLocale() == null : this.getLocale().equals(other.getLocale())) && (this.getLanguage() == null ? other.getLanguage() == null : this.getLanguage().equals(other.getLanguage()))
&& (this.getTimezone() == null ? other.getTimezone() == null : this.getTimezone().equals(other.getTimezone())) && (this.getTimezone() == null ? other.getTimezone() == null : this.getTimezone().equals(other.getTimezone()))
&& (this.getActive() == null ? other.getActive() == null : this.getActive().equals(other.getActive())); && (this.getActive() == null ? other.getActive() == null : this.getActive().equals(other.getActive()));
} }
@ -157,7 +157,7 @@ public class UserRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user * This method corresponds to the database table user
* *
* @mbg.generated Wed Feb 13 15:21:36 CET 2019 * @mbg.generated Mon Feb 25 10:55:53 CET 2019
*/ */
@Override @Override
public int hashCode() { public int hashCode() {
@ -170,7 +170,7 @@ public class UserRecord {
result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode()); result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode()); result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode()); result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode());
result = prime * result + ((getLocale() == null) ? 0 : getLocale().hashCode()); result = prime * result + ((getLanguage() == null) ? 0 : getLanguage().hashCode());
result = prime * result + ((getTimezone() == null) ? 0 : getTimezone().hashCode()); result = prime * result + ((getTimezone() == null) ? 0 : getTimezone().hashCode());
result = prime * result + ((getActive() == null) ? 0 : getActive().hashCode()); result = prime * result + ((getActive() == null) ? 0 : getActive().hashCode());
return result; return result;

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

@ -213,7 +213,7 @@ public class PaginationService {
userTableMap.put(Domain.USER.ATTR_NAME, UserRecordDynamicSqlSupport.name.name()); userTableMap.put(Domain.USER.ATTR_NAME, UserRecordDynamicSqlSupport.name.name());
userTableMap.put(Domain.USER.ATTR_USERNAME, UserRecordDynamicSqlSupport.username.name()); userTableMap.put(Domain.USER.ATTR_USERNAME, UserRecordDynamicSqlSupport.username.name());
userTableMap.put(Domain.USER.ATTR_EMAIL, UserRecordDynamicSqlSupport.email.name()); userTableMap.put(Domain.USER.ATTR_EMAIL, UserRecordDynamicSqlSupport.email.name());
userTableMap.put(Domain.USER.ATTR_LOCALE, UserRecordDynamicSqlSupport.locale.name()); userTableMap.put(Domain.USER.ATTR_LANGUAGE, UserRecordDynamicSqlSupport.language.name());
this.sortColumnMapping.put(UserRecordDynamicSqlSupport.userRecord.name(), userTableMap); this.sortColumnMapping.put(UserRecordDynamicSqlSupport.userRecord.name(), userTableMap);
this.defaultSortColumn.put(UserRecordDynamicSqlSupport.userRecord.name(), Domain.USER.ATTR_ID); this.defaultSortColumn.put(UserRecordDynamicSqlSupport.userRecord.name(), Domain.USER.ATTR_ID);

4
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/FilterMap.java
View file

@ -44,8 +44,8 @@ public class FilterMap extends POSTMapper {
return getSQLWildcard(UserInfo.FILTER_ATTR_EMAIL); return getSQLWildcard(UserInfo.FILTER_ATTR_EMAIL);
} }
public String getUserLocale() { public String getUserLanguage() {
return getString(UserInfo.FILTER_ATTR_LOCALE); return getString(UserInfo.FILTER_ATTR_LANGUAGE);
} }
public String getLmsSetupName() { public String getLmsSetupName() {

34
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/UserDaoImpl.java
View file

@ -34,10 +34,13 @@ import org.springframework.transaction.annotation.Transactional;
import ch.ethz.seb.sebserver.WebSecurityConfig; import ch.ethz.seb.sebserver.WebSecurityConfig;
import ch.ethz.seb.sebserver.gbl.api.API.BulkActionType; import ch.ethz.seb.sebserver.gbl.api.API.BulkActionType;
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.APIMessageException;
import ch.ethz.seb.sebserver.gbl.api.APIMessage.ErrorMessage; import ch.ethz.seb.sebserver.gbl.api.APIMessage.ErrorMessage;
import ch.ethz.seb.sebserver.gbl.api.EntityType; 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.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.user.UserAccount;
import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
import ch.ethz.seb.sebserver.gbl.model.user.UserMod; import ch.ethz.seb.sebserver.gbl.model.user.UserMod;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
@ -165,8 +168,8 @@ public class UserDaoImpl implements UserDAO {
UserRecordDynamicSqlSupport.email, UserRecordDynamicSqlSupport.email,
isLikeWhenPresent(filterMap.getUserEmail())) isLikeWhenPresent(filterMap.getUserEmail()))
.and( .and(
UserRecordDynamicSqlSupport.locale, UserRecordDynamicSqlSupport.language,
isLikeWhenPresent(filterMap.getUserLocale())) isLikeWhenPresent(filterMap.getUserLanguage()))
.build() .build()
.execute() .execute()
.stream() .stream()
@ -185,6 +188,8 @@ public class UserDaoImpl implements UserDAO {
throw new APIMessageException(ErrorMessage.PASSWORD_MISMATCH); throw new APIMessageException(ErrorMessage.PASSWORD_MISMATCH);
} }
checkUniqueUsername(userMod);
final UserRecord recordToSave = new UserRecord( final UserRecord recordToSave = new UserRecord(
null, null,
userMod.institutionId, userMod.institutionId,
@ -193,7 +198,7 @@ public class UserDaoImpl implements UserDAO {
userMod.username, userMod.username,
this.userPasswordEncoder.encode(userMod.getNewPassword()), this.userPasswordEncoder.encode(userMod.getNewPassword()),
userMod.email, userMod.email,
userMod.locale.toLanguageTag(), userMod.language.toLanguageTag(),
userMod.timeZone.getID(), userMod.timeZone.getID(),
BooleanUtils.toInteger(false)); BooleanUtils.toInteger(false));
@ -237,6 +242,9 @@ public class UserDaoImpl implements UserDAO {
public Result<UserInfo> save(final UserInfo userInfo) { public Result<UserInfo> save(final UserInfo userInfo) {
return recordByUUID(userInfo.uuid) return recordByUUID(userInfo.uuid)
.map(record -> { .map(record -> {
checkUniqueUsername(userInfo);
final UserRecord newRecord = new UserRecord( final UserRecord newRecord = new UserRecord(
record.getId(), record.getId(),
null, null,
@ -245,7 +253,7 @@ public class UserDaoImpl implements UserDAO {
userInfo.username, userInfo.username,
null, null,
userInfo.email, userInfo.email,
userInfo.locale.toLanguageTag(), userInfo.language.toLanguageTag(),
userInfo.timeZone.getID(), userInfo.timeZone.getID(),
null); null);
@ -452,7 +460,7 @@ public class UserDaoImpl implements UserDAO {
record.getUsername(), record.getUsername(),
record.getEmail(), record.getEmail(),
BooleanUtils.toBooleanObject(record.getActive()), BooleanUtils.toBooleanObject(record.getActive()),
Locale.forLanguageTag(record.getLocale()), Locale.forLanguageTag(record.getLanguage()),
DateTimeZone.forID(record.getTimezone()), DateTimeZone.forID(record.getTimezone()),
userRoles); userRoles);
}); });
@ -466,4 +474,20 @@ public class UserDaoImpl implements UserDAO {
record.getPassword())); record.getPassword()));
} }
private void checkUniqueUsername(final UserAccount userAccount) {
// check same username already exists
final Long otherUsersWithSameName = this.userRecordMapper
.countByExample()
.where(UserRecordDynamicSqlSupport.username, isEqualTo(userAccount.getUsername()))
.and(UserRecordDynamicSqlSupport.uuid, isNotEqualToWhenPresent(userAccount.getModelId()))
.build()
.execute();
if (otherUsersWithSameName != null && otherUsersWithSameName.longValue() > 0) {
throw new APIMessageException(APIMessage.fieldValidationError(
Domain.USER.ATTR_USERNAME,
"user:username:username.notunique"));
}
}
} }

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/validation/BeanValidationService.java
View file

@ -36,7 +36,7 @@ public class BeanValidationService {
this.validator = validator; this.validator = validator;
this.activatableDAOs = activatableDAOs this.activatableDAOs = activatableDAOs
.stream() .stream()
.collect(Collectors.toUnmodifiableMap( .collect(Collectors.toMap(
dao -> dao.entityType(), dao -> dao.entityType(),
dao -> dao)); dao -> dao));
} }

7
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/UserAccountController.java
View file

@ -105,6 +105,7 @@ public class UserAccountController extends ActivatableEntityController<UserInfo,
throw new IllegalAPIArgumentException( throw new IllegalAPIArgumentException(
"User within an inactive institution cannot be created nor modified"); "User within an inactive institution cannot be created nor modified");
} }
return userInfo; return userInfo;
}); });
} }
@ -118,7 +119,7 @@ public class UserAccountController extends ActivatableEntityController<UserInfo,
final String modelId = passwordChange.getModelId(); final String modelId = passwordChange.getModelId();
return this.userDAO.byModelId(modelId) return this.userDAO.byModelId(modelId)
.flatMap(this.authorization::checkWrite) .flatMap(this.authorization::checkModify)
.map(ui -> checkPasswordChange(ui, passwordChange)) .map(ui -> checkPasswordChange(ui, passwordChange))
.flatMap(e -> this.userDAO.changePassword(modelId, passwordChange.getNewPassword())) .flatMap(e -> this.userDAO.changePassword(modelId, passwordChange.getNewPassword()))
.flatMap(this::revokeAccessToken) .flatMap(this::revokeAccessToken)
@ -135,7 +136,7 @@ public class UserAccountController extends ActivatableEntityController<UserInfo,
new FieldError( new FieldError(
"passwordChange", "passwordChange",
PasswordChange.ATTR_NAME_OLD_PASSWORD, PasswordChange.ATTR_NAME_OLD_PASSWORD,
"old password is wrong"))); "user:oldPassword:password.wrong")));
} }
if (!passwordChange.newPasswordMatch()) { if (!passwordChange.newPasswordMatch()) {
@ -144,7 +145,7 @@ public class UserAccountController extends ActivatableEntityController<UserInfo,
new FieldError( new FieldError(
"passwordChange", "passwordChange",
PasswordChange.ATTR_NAME_RETYPED_NEW_PASSWORD, PasswordChange.ATTR_NAME_RETYPED_NEW_PASSWORD,
"old password is wrong"))); "user:retypedNewPassword:password.mismatch")));
} }
return info; return info;

10
src/main/resources/messages.properties
View file

@ -23,6 +23,9 @@ sebserver.form.validation.fieldError.size=The size must be between {3} and {4}
sebserver.form.validation.fieldError.name=Name is mandatory and must have a size between 3 and 255 character sebserver.form.validation.fieldError.name=Name is mandatory and must have a size between 3 and 255 character
sebserver.form.validation.fieldError.urlSuffix=URL Suffix must have a size between 3 and 255 character sebserver.form.validation.fieldError.urlSuffix=URL Suffix must have a size between 3 and 255 character
sebserver.form.validation.fieldError.notNull=This field is mandatory sebserver.form.validation.fieldError.notNull=This field is mandatory
sebserver.form.validation.fieldError.username.notunique=This Username is already in use. Please choose another one.
sebserver.form.validation.fieldError.password.wrong=Old password is wrong
sebserver.form.validation.fieldError.password.mismatch=Re-typed password don't match new password
sebserver.error.unexpected=Unexpected Error sebserver.error.unexpected=Unexpected Error
sebserver.page.message=Information sebserver.page.message=Information
sebserver.dialog.confirm.title=Confirmation sebserver.dialog.confirm.title=Confirmation
@ -41,6 +44,8 @@ sebserver.login.failed.title=Login Failed
sebserver.login.failed.message=Access Denied: Wrong username or password sebserver.login.failed.message=Access Denied: Wrong username or password
sebserver.logout=Sign out sebserver.logout=Sign out
sebserver.logout.success.message=You have been successfully signed out. sebserver.logout.success.message=You have been successfully signed out.
sebserver.login.password.change=Information
sebserver.login.password.change.success=Password successfully changed. Please sign in with your new password
################################ ################################
# Main Page # Main Page
@ -62,6 +67,7 @@ sebserver.institution.list.column.urlSuffix=URL Suffix
sebserver.institution.list.column.active=Active sebserver.institution.list.column.active=Active
sebserver.institution.action.list=Institution sebserver.institution.action.list=Institution
sebserver.institution.action.form=Institution
sebserver.institution.action.new=New Institution sebserver.institution.action.new=New Institution
sebserver.institution.action.list.view=View Selected sebserver.institution.action.list.view=View Selected
sebserver.institution.action.modify=Edit Institution sebserver.institution.action.modify=Edit Institution
@ -71,6 +77,7 @@ sebserver.institution.action.activate=Active
sebserver.institution.action.deactivate=Active sebserver.institution.action.deactivate=Active
sebserver.institution.action.delete=Delete Institution sebserver.institution.action.delete=Delete Institution
sebserver.institution.info.pleaseSelect=Please Select an Institution first. sebserver.institution.info.pleaseSelect=Please Select an Institution first.
sebserver.institution.form.title.new=New Institution sebserver.institution.form.title.new=New Institution
sebserver.institution.form.title=Institution : {0} sebserver.institution.form.title=Institution : {0}
@ -97,6 +104,7 @@ sebserver.useraccount.list.column.language=Language
sebserver.useraccount.list.column.active=Active sebserver.useraccount.list.column.active=Active
sebserver.useraccount.action.list=User Account sebserver.useraccount.action.list=User Account
sebserver.useraccount.action.form=User Account
sebserver.useraccount.action.new=New User Account sebserver.useraccount.action.new=New User Account
sebserver.useraccount.action.view=View Selected sebserver.useraccount.action.view=View Selected
sebserver.useraccount.action.list.modify=Edit Selected sebserver.useraccount.action.list.modify=Edit Selected
@ -106,6 +114,7 @@ sebserver.useraccount.action.activate=Active
sebserver.useraccount.action.deactivate=Active sebserver.useraccount.action.deactivate=Active
sebserver.useraccount.action.delete=Delete User Account sebserver.useraccount.action.delete=Delete User Account
sebserver.useraccount.action.change.password=Change Password sebserver.useraccount.action.change.password=Change Password
sebserver.useraccount.action.change.password.save=Save New Password
sebserver.useraccount.info.pleaseSelect=Please Select an User Account first. sebserver.useraccount.info.pleaseSelect=Please Select an User Account first.
@ -128,3 +137,4 @@ sebserver.useraccount.form.institution.password.retyped=Retyped New Password

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

@ -306,8 +306,8 @@ CREATE TABLE IF NOT EXISTS `user` (
`name` VARCHAR(255) NOT NULL, `name` VARCHAR(255) NOT NULL,
`username` VARCHAR(255) NOT NULL, `username` VARCHAR(255) NOT NULL,
`password` VARCHAR(255) NOT NULL, `password` VARCHAR(255) NOT NULL,
`email` VARCHAR(255) NOT NULL, `email` VARCHAR(255) NULL,
`locale` VARCHAR(45) NOT NULL, `language` VARCHAR(45) NOT NULL,
`timeZone` VARCHAR(45) NOT NULL, `timeZone` VARCHAR(45) NOT NULL,
`active` INT(1) NOT NULL, `active` INT(1) NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),

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

@ -310,8 +310,8 @@ CREATE TABLE IF NOT EXISTS `user` (
`name` VARCHAR(255) NOT NULL, `name` VARCHAR(255) NOT NULL,
`username` VARCHAR(255) NOT NULL, `username` VARCHAR(255) NOT NULL,
`password` VARCHAR(255) NOT NULL, `password` VARCHAR(255) NOT NULL,
`email` VARCHAR(255) NOT NULL, `email` VARCHAR(255) NULL,
`locale` VARCHAR(45) NOT NULL, `language` VARCHAR(45) NOT NULL,
`timeZone` VARCHAR(45) NOT NULL, `timeZone` VARCHAR(45) NOT NULL,
`active` INT(1) NOT NULL, `active` INT(1) NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),

5
src/main/resources/static/css/sebserver.css
View file

@ -152,6 +152,11 @@ Composite.login {
border-radius: 2px; border-radius: 2px;
} }
Composite.error {
background-color: #82BE1E;
margin: 0 0 0 0;
}
*.header { *.header {
font: bold 12px Arial, Helvetica, sans-serif; font: bold 12px Arial, Helvetica, sans-serif;
color: #FFFFFF; color: #FFFFFF;

14
src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java
View file

@ -65,7 +65,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
+ "\"username\":\"admin\"," + "\"username\":\"admin\","
+ "\"email\":\"admin@nomail.nomail\"," + "\"email\":\"admin@nomail.nomail\","
+ "\"active\":true," + "\"active\":true,"
+ "\"locale\":\"en\"," + "\"language\":\"en\","
+ "\"timezone\":\"UTC\"," + "\"timezone\":\"UTC\","
+ "\"userRoles\":[\"SEB_SERVER_ADMIN\"]}", + "\"userRoles\":[\"SEB_SERVER_ADMIN\"]}",
contentAsString); contentAsString);
@ -83,7 +83,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
+ "\"username\":\"inst1Admin\"," + "\"username\":\"inst1Admin\","
+ "\"email\":\"admin@nomail.nomail\"," + "\"email\":\"admin@nomail.nomail\","
+ "\"active\":true," + "\"active\":true,"
+ "\"locale\":\"en\"," + "\"language\":\"en\","
+ "\"timezone\":\"UTC\"," + "\"timezone\":\"UTC\","
+ "\"userRoles\":[\"INSTITUTIONAL_ADMIN\"]}", + "\"userRoles\":[\"INSTITUTIONAL_ADMIN\"]}",
contentAsString); contentAsString);
@ -106,7 +106,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
+ "\"username\":\"inst1Admin\"," + "\"username\":\"inst1Admin\","
+ "\"email\":\"admin@nomail.nomail\"," + "\"email\":\"admin@nomail.nomail\","
+ "\"active\":true," + "\"active\":true,"
+ "\"locale\":\"en\"," + "\"language\":\"en\","
+ "\"timezone\":\"UTC\"," + "\"timezone\":\"UTC\","
+ "\"userRoles\":[\"INSTITUTIONAL_ADMIN\"]}", + "\"userRoles\":[\"INSTITUTIONAL_ADMIN\"]}",
contentAsString); contentAsString);
@ -448,8 +448,9 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
.contentType(MediaType.APPLICATION_FORM_URLENCODED) .contentType(MediaType.APPLICATION_FORM_URLENCODED)
.param(Domain.USER.ATTR_NAME, "NewTestUser") .param(Domain.USER.ATTR_NAME, "NewTestUser")
.param(Domain.USER.ATTR_USERNAME, "NewTestUser") .param(Domain.USER.ATTR_USERNAME, "NewTestUser")
.param(Domain.USER.ATTR_LOCALE, Locale.ENGLISH.toLanguageTag()) .param(Domain.USER.ATTR_LANGUAGE, Locale.ENGLISH.toLanguageTag())
.param(Domain.USER.ATTR_TIMEZONE, DateTimeZone.UTC.getID()) .param(Domain.USER.ATTR_TIMEZONE, DateTimeZone.UTC.getID())
.param(Domain.USER_ROLE.REFERENCE_NAME, UserRole.EXAM_ADMIN.name())
.param(PasswordChange.ATTR_NAME_NEW_PASSWORD, "12345678") .param(PasswordChange.ATTR_NAME_NEW_PASSWORD, "12345678")
.param(PasswordChange.ATTR_NAME_RETYPED_NEW_PASSWORD, "12345678")) .param(PasswordChange.ATTR_NAME_RETYPED_NEW_PASSWORD, "12345678"))
.andExpect(status().isOk()) .andExpect(status().isOk())
@ -581,7 +582,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
"newUser1", "newUser1",
"newUser@nomail.nomail", "newUser@nomail.nomail",
user.getActive(), user.getActive(),
user.getLocale(), user.getLanguage(),
user.getTimeZone(), user.getTimeZone(),
Stream.of(UserRole.EXAM_ADMIN.name(), UserRole.EXAM_SUPPORTER.name()).collect(Collectors.toSet())); Stream.of(UserRole.EXAM_ADMIN.name(), UserRole.EXAM_SUPPORTER.name()).collect(Collectors.toSet()));
final String modifyUserJson = this.jsonMapper.writeValueAsString(modifyUser); final String modifyUserJson = this.jsonMapper.writeValueAsString(modifyUser);
@ -648,8 +649,9 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
.param(Domain.USER.ATTR_INSTITUTION_ID, String.valueOf(institution.id)) .param(Domain.USER.ATTR_INSTITUTION_ID, String.valueOf(institution.id))
.param(Domain.USER.ATTR_NAME, "NewTestUser") .param(Domain.USER.ATTR_NAME, "NewTestUser")
.param(Domain.USER.ATTR_USERNAME, "NewTestUser") .param(Domain.USER.ATTR_USERNAME, "NewTestUser")
.param(Domain.USER.ATTR_LOCALE, Locale.ENGLISH.toLanguageTag()) .param(Domain.USER.ATTR_LANGUAGE, Locale.ENGLISH.toLanguageTag())
.param(Domain.USER.ATTR_TIMEZONE, DateTimeZone.UTC.getID()) .param(Domain.USER.ATTR_TIMEZONE, DateTimeZone.UTC.getID())
.param(Domain.USER_ROLE.REFERENCE_NAME, UserRole.EXAM_ADMIN.name())
.param(PasswordChange.ATTR_NAME_NEW_PASSWORD, "12345678") .param(PasswordChange.ATTR_NAME_NEW_PASSWORD, "12345678")
.param(PasswordChange.ATTR_NAME_RETYPED_NEW_PASSWORD, "12345678")) .param(PasswordChange.ATTR_NAME_RETYPED_NEW_PASSWORD, "12345678"))
.andExpect(status().isBadRequest()) .andExpect(status().isBadRequest())

4
src/test/resources/schema-test.sql
View file

@ -306,8 +306,8 @@ CREATE TABLE IF NOT EXISTS `user` (
`name` VARCHAR(255) NOT NULL, `name` VARCHAR(255) NOT NULL,
`username` VARCHAR(255) NOT NULL, `username` VARCHAR(255) NOT NULL,
`password` VARCHAR(255) NOT NULL, `password` VARCHAR(255) NOT NULL,
`email` VARCHAR(255) NOT NULL, `email` VARCHAR(255) NULL,
`locale` VARCHAR(45) NOT NULL, `language` VARCHAR(45) NOT NULL,
`timeZone` VARCHAR(45) NOT NULL, `timeZone` VARCHAR(45) NOT NULL,
`active` INT(1) NOT NULL, `active` INT(1) NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),