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

GUI improvements and added surname to user-account

Browse source
This commit is contained in:
anhefti 2020-01-30 16:19:50 +01:00
parent 2f64cf92e0
commit 77556a914c
119 changed files with 1375 additions and 1184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pom.xml
View file

@ -222,10 +222,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId> <artifactId>spring-boot-starter-tomcat</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId> <artifactId>spring-boot-starter-jdbc</artifactId>
@ -242,6 +238,16 @@
<groupId>com.fasterxml.jackson.dataformat</groupId> <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId> <artifactId>jackson-dataformat-xml</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter-reactor-netty</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- NOTE since org.springframework.security.oauth is not fully migrated <!-- NOTE since org.springframework.security.oauth is not fully migrated
to spring-boot-starter-security we have to declare a separate version here. to spring-boot-starter-security we have to declare a separate version here.
This refers to the latest version of spring-security-oauth2 and should be This refers to the latest version of spring-security-oauth2 and should be

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="2020-01-09T10:29:16.698+01:00") @Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2020-01-29T14:47:50.177+01:00")
public enum EntityType { public enum EntityType {
CONFIGURATION_ATTRIBUTE, CONFIGURATION_ATTRIBUTE,
CONFIGURATION_VALUE, CONFIGURATION_VALUE,

10
src/main/java/ch/ethz/seb/sebserver/gbl/async/AsyncService.java
View file

@ -40,16 +40,6 @@ public class AsyncService {
timeToRecover); timeToRecover);
} }
// public <T> MemoizingCircuitBreaker<T> createMemoizingCircuitBreaker(
// final Supplier<T> blockingSupplier) {
//
// return new MemoizingCircuitBreaker<>(
// this.asyncRunner,
// blockingSupplier,
// true,
// Constants.HOUR_IN_MILLIS);
// }
public <T> MemoizingCircuitBreaker<T> createMemoizingCircuitBreaker( public <T> MemoizingCircuitBreaker<T> createMemoizingCircuitBreaker(
final Supplier<T> blockingSupplier, final Supplier<T> blockingSupplier,
final int maxFailingAttempts, final int maxFailingAttempts,

14
src/main/java/ch/ethz/seb/sebserver/gbl/async/AsyncServiceSpringConfig.java
View file

@ -37,6 +37,20 @@ public class AsyncServiceSpringConfig implements AsyncConfigurer {
return executor; return executor;
} }
public static final String EXAMP_AIP_EXECUTOR_BEAN_NAME = "ExamAPIAsyncServiceExecutorBean";
@Bean(name = EXAMP_AIP_EXECUTOR_BEAN_NAME)
public Executor examAPIThreadPoolTaskExecutor() {
final ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(200);
executor.setMaxPoolSize(2000);
executor.setQueueCapacity(2000);
executor.setThreadNamePrefix("examService-");
executor.initialize();
executor.setWaitForTasksToCompleteOnShutdown(false);
return executor;
}
@Override @Override
public Executor getAsyncExecutor() { public Executor getAsyncExecutor() {
return threadPoolTaskExecutor(); return threadPoolTaskExecutor();

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

@ -3,9 +3,12 @@ package ch.ethz.seb.sebserver.gbl.model;
import javax.annotation.Generated; 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
* This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/ * the integrated GUI
@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2020-01-09T10:29:16.659+01:00") * 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 = "2020-01-29T14:47:50.132+01:00")
public interface Domain { public interface Domain {
interface CONFIGURATION_ATTRIBUTE { interface CONFIGURATION_ATTRIBUTE {
@ -215,6 +218,7 @@ public interface Domain {
String ATTR_INSTITUTION_ID = "institutionId"; String ATTR_INSTITUTION_ID = "institutionId";
String ATTR_UUID = "uuid"; String ATTR_UUID = "uuid";
String ATTR_NAME = "name"; String ATTR_NAME = "name";
String ATTR_SURNAME = "surname";
String ATTR_USERNAME = "username"; String ATTR_USERNAME = "username";
String ATTR_PASSWORD = "password"; String ATTR_PASSWORD = "password";
String ATTR_EMAIL = "email"; String ATTR_EMAIL = "email";

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

@ -29,10 +29,13 @@ public interface UserAccount extends GrantEntity, Activatable {
@Override @Override
Long getInstitutionId(); Long getInstitutionId();
/** The name of the User-Account */ /** The first name of the User */
@Override @Override
String getName(); String getName();
/** The surname of the User */
String getSurname();
/** The user-name or login-name of the User-Account */ /** The user-name or login-name of the User-Account */
String getUsername(); String getUsername();

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

@ -63,12 +63,17 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
@JsonProperty(USER.ATTR_INSTITUTION_ID) @JsonProperty(USER.ATTR_INSTITUTION_ID)
public final Long institutionId; public final Long institutionId;
/** Full name of the user */ /** First name of the user */
@NotNull(message = "user:name:notNull") @NotNull(message = "user:name:notNull")
@Size(min = 3, max = 255, message = "user:name:size:{min}:{max}:${validatedValue}") @Size(min = 3, max = 255, message = "user:name:size:{min}:{max}:${validatedValue}")
@JsonProperty(USER.ATTR_NAME) @JsonProperty(USER.ATTR_NAME)
public final String name; public final String name;
/** Surname of the user */
@Size(max = 255, message = "user:surname:size:{min}:{max}:${validatedValue}")
@JsonProperty(USER.ATTR_SURNAME)
public final String surname;
/** The internal user name */ /** The internal user name */
@NotNull(message = "user:username:notNull") @NotNull(message = "user:username:notNull")
@Size(min = 3, max = 255, message = "user:username:size:{min}:{max}:${validatedValue}") @Size(min = 3, max = 255, message = "user:username:size:{min}:{max}:${validatedValue}")
@ -106,6 +111,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
@JsonProperty(USER.ATTR_UUID) final String uuid, @JsonProperty(USER.ATTR_UUID) final String uuid,
@JsonProperty(USER.ATTR_INSTITUTION_ID) final Long institutionId, @JsonProperty(USER.ATTR_INSTITUTION_ID) final Long institutionId,
@JsonProperty(USER.ATTR_NAME) final String name, @JsonProperty(USER.ATTR_NAME) final String name,
@JsonProperty(USER.ATTR_SURNAME) final String surname,
@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,
@ -116,6 +122,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
this.uuid = uuid; this.uuid = uuid;
this.institutionId = institutionId; this.institutionId = institutionId;
this.name = name; this.name = name;
this.surname = surname;
this.username = username; this.username = username;
this.email = email; this.email = email;
this.active = BooleanUtils.isTrue(active); this.active = BooleanUtils.isTrue(active);
@ -153,6 +160,11 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
return this.name; return this.name;
} }
@Override
public String getSurname() {
return this.surname;
}
@Override @Override
public String getUsername() { public String getUsername() {
return this.username; return this.username;
@ -280,6 +292,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
userInfo.getInstitutionId(), userInfo.getInstitutionId(),
userInfo.getName(), userInfo.getName(),
userInfo.getUsername(), userInfo.getUsername(),
userInfo.getSurname(),
userInfo.getEmail(), userInfo.getEmail(),
userInfo.getActive(), userInfo.getActive(),
userInfo.getLanguage(), userInfo.getLanguage(),
@ -291,6 +304,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
* *
* @param userInfo UserInfo instance to copy * @param userInfo UserInfo instance to copy
* @param name new name or null if the name of given userInfo should be taken * @param name new name or null if the name of given userInfo should be taken
* @param surname new surname or null if the name of given userInfo should be taken
* @param username new username or null if the username of given userInfo should be taken * @param username new username or null if the username of given userInfo should be taken
* @param email new email or null if the email of given userInfo should be taken * @param email new email or null if the email of given userInfo should be taken
* @param language new language or null if the language of given userInfo should be taken * @param language new language or null if the language of given userInfo should be taken
@ -301,6 +315,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
final UserInfo userInfo, final UserInfo userInfo,
final String name, final String name,
final String username, final String username,
final String surname,
final String email, final String email,
final Locale language, final Locale language,
final DateTimeZone timeZone, final DateTimeZone timeZone,
@ -310,6 +325,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
userInfo.getUuid(), userInfo.getUuid(),
userInfo.getInstitutionId(), userInfo.getInstitutionId(),
(name != null) ? name : userInfo.getName(), (name != null) ? name : userInfo.getName(),
(surname != null) ? surname : userInfo.getSurname(),
(username != null) ? username : userInfo.getUsername(), (username != null) ? username : userInfo.getUsername(),
(email != null) ? email : userInfo.getEmail(), (email != null) ? email : userInfo.getEmail(),
userInfo.getActive(), userInfo.getActive(),
@ -318,19 +334,11 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
(roles != null) ? new HashSet<>(Arrays.asList(roles)) : userInfo.roles); (roles != null) ? new HashSet<>(Arrays.asList(roles)) : userInfo.roles);
} }
public static final UserInfo withName(final UserInfo userInfo, final String name) {
return of(userInfo, name, null, null, null, null, (String[]) null);
}
public static final UserInfo withUserName(final UserInfo userInfo, final String username) {
return of(userInfo, null, username, null, null, null, (String[]) null);
}
public static final UserInfo withEMail(final UserInfo userInfo, final String email) { public static final UserInfo withEMail(final UserInfo userInfo, final String email) {
return of(userInfo, null, null, email, null, null, (String[]) null); return of(userInfo, null, null, null, email, null, null, (String[]) null);
} }
public static final UserInfo withRoles(final UserInfo userInfo, final String... roles) { public static final UserInfo withRoles(final UserInfo userInfo, final String... roles) {
return of(userInfo, null, null, null, null, null, roles); return of(userInfo, null, null, null, null, null, null, roles);
} }
} }

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

@ -46,12 +46,17 @@ public final class UserMod implements UserAccount {
@JsonProperty(USER.ATTR_INSTITUTION_ID) @JsonProperty(USER.ATTR_INSTITUTION_ID)
public final Long institutionId; public final Long institutionId;
/** Full name of the user */ /** first (or full) name of the user */
@NotNull(message = "user:name:notNull") @NotNull(message = "user:name:notNull")
@Size(min = 3, max = 255, message = "user:name:size:{min}:{max}:${validatedValue}") @Size(min = 3, max = 255, message = "user:name:size:{min}:{max}:${validatedValue}")
@JsonProperty(USER.ATTR_NAME) @JsonProperty(USER.ATTR_NAME)
public final String name; public final String name;
/** surname of the user */
@Size(max = 255, message = "user:surname:size:{min}:{max}:${validatedValue}")
@JsonProperty(USER.ATTR_SURNAME)
public final String surname;
/** The internal user name */ /** The internal user name */
@NotNull(message = "user:username:notNull") @NotNull(message = "user:username:notNull")
@Size(min = 3, max = 255, message = "user:username:size:{min}:{max}:${validatedValue}") @Size(min = 3, max = 255, message = "user:username:size:{min}:{max}:${validatedValue}")
@ -93,6 +98,7 @@ public final class UserMod implements UserAccount {
@JsonProperty(USER.ATTR_UUID) final String uuid, @JsonProperty(USER.ATTR_UUID) final String uuid,
@JsonProperty(USER.ATTR_INSTITUTION_ID) final Long institutionId, @JsonProperty(USER.ATTR_INSTITUTION_ID) final Long institutionId,
@JsonProperty(USER.ATTR_NAME) final String name, @JsonProperty(USER.ATTR_NAME) final String name,
@JsonProperty(USER.ATTR_SURNAME) final String surname,
@JsonProperty(USER.ATTR_USERNAME) final String username, @JsonProperty(USER.ATTR_USERNAME) final String username,
@JsonProperty(PasswordChange.ATTR_NAME_NEW_PASSWORD) final CharSequence newPassword, @JsonProperty(PasswordChange.ATTR_NAME_NEW_PASSWORD) final CharSequence newPassword,
@JsonProperty(PasswordChange.ATTR_NAME_CONFIRM_NEW_PASSWORD) final CharSequence confirmNewPassword, @JsonProperty(PasswordChange.ATTR_NAME_CONFIRM_NEW_PASSWORD) final CharSequence confirmNewPassword,
@ -106,6 +112,7 @@ public final class UserMod implements UserAccount {
this.newPassword = newPassword; this.newPassword = newPassword;
this.confirmNewPassword = confirmNewPassword; this.confirmNewPassword = confirmNewPassword;
this.name = name; this.name = name;
this.surname = surname;
this.username = username; this.username = username;
this.email = email; this.email = email;
this.language = (language != null) ? language : Locale.ENGLISH; this.language = (language != null) ? language : Locale.ENGLISH;
@ -121,6 +128,7 @@ public final class UserMod implements UserAccount {
this.newPassword = postAttrMapper.getString(PasswordChange.ATTR_NAME_NEW_PASSWORD); this.newPassword = postAttrMapper.getString(PasswordChange.ATTR_NAME_NEW_PASSWORD);
this.confirmNewPassword = postAttrMapper.getString(PasswordChange.ATTR_NAME_CONFIRM_NEW_PASSWORD); this.confirmNewPassword = postAttrMapper.getString(PasswordChange.ATTR_NAME_CONFIRM_NEW_PASSWORD);
this.name = postAttrMapper.getString(USER.ATTR_NAME); this.name = postAttrMapper.getString(USER.ATTR_NAME);
this.surname = postAttrMapper.getString(USER.ATTR_SURNAME);
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.language = postAttrMapper.getLocale(USER.ATTR_LANGUAGE); this.language = postAttrMapper.getLocale(USER.ATTR_LANGUAGE);
@ -157,6 +165,11 @@ public final class UserMod implements UserAccount {
return this.name; return this.name;
} }
@Override
public String getSurname() {
return this.surname;
}
@Override @Override
public String getUsername() { public String getUsername() {
return this.username; return this.username;
@ -235,6 +248,8 @@ public final class UserMod implements UserAccount {
builder.append(this.institutionId); builder.append(this.institutionId);
builder.append(", name="); builder.append(", name=");
builder.append(this.name); builder.append(this.name);
builder.append(", surname=");
builder.append(this.surname);
builder.append(", username="); builder.append(", username=");
builder.append(this.username); builder.append(this.username);
builder.append(", email="); builder.append(", email=");
@ -257,7 +272,7 @@ public final class UserMod implements UserAccount {
return new UserMod( return new UserMod(
UUID.randomUUID().toString(), UUID.randomUUID().toString(),
institutionId, institutionId,
null, null, null, null, null, null, null, null); null, null, null, null, null, null, null, null, null);
} }
} }

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

@ -281,14 +281,14 @@ public class ExamForm implements TemplateComposer {
.addField(FormBuilder.text( .addField(FormBuilder.text(
QuizData.QUIZ_ATTR_START_TIME, QuizData.QUIZ_ATTR_START_TIME,
FORM_STARTTIME_TEXT_KEY, FORM_STARTTIME_TEXT_KEY,
i18nSupport.formatDisplayDate(exam.startTime)) i18nSupport.formatDisplayDateWithTimeZone(exam.startTime))
.readonly(true) .readonly(true)
.withInputSpan(3) .withInputSpan(3)
.withEmptyCellSeparation(false)) .withEmptyCellSeparation(false))
.addField(FormBuilder.text( .addField(FormBuilder.text(
QuizData.QUIZ_ATTR_END_TIME, QuizData.QUIZ_ATTR_END_TIME,
FORM_ENDTIME_TEXT_KEY, FORM_ENDTIME_TEXT_KEY,
i18nSupport.formatDisplayDate(exam.endTime)) i18nSupport.formatDisplayDateWithTimeZone(exam.endTime))
.readonly(true) .readonly(true)
.withInputSpan(3) .withInputSpan(3)
.withEmptyCellSeparation(false)) .withEmptyCellSeparation(false))

5
src/main/java/ch/ethz/seb/sebserver/gui/content/ExamList.java
View file

@ -203,8 +203,9 @@ public class ExamList implements TemplateComposer {
final GrantCheck userGrant = currentUser.grantCheck(EntityType.EXAM); final GrantCheck userGrant = currentUser.grantCheck(EntityType.EXAM);
actionBuilder actionBuilder
.newAction(ActionDefinition.EXAM_IMPORT) // Removed as discussed in SEBSERV-52
.publishIf(userGrant::im) // .newAction(ActionDefinition.EXAM_IMPORT)
// .publishIf(userGrant::im)
.newAction(ActionDefinition.EXAM_VIEW_FROM_LIST) .newAction(ActionDefinition.EXAM_VIEW_FROM_LIST)
.withSelect(table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) .withSelect(table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY)

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

@ -86,7 +86,6 @@ public class InstitutionForm implements TemplateComposer {
final EntityGrantCheck instGrant = this.currentUser.entityGrantCheck(institution); final EntityGrantCheck instGrant = this.currentUser.entityGrantCheck(institution);
final boolean writeGrant = instGrant.w(); final boolean writeGrant = instGrant.w();
final boolean modifyGrant = instGrant.m(); final boolean modifyGrant = instGrant.m();
final boolean userWriteGrant = this.currentUser.grantCheck(EntityType.USER).w();
final boolean isReadonly = pageContext.isReadonly(); final boolean isReadonly = pageContext.isReadonly();
// new PageContext with actual EntityKey // new PageContext with actual EntityKey
@ -131,9 +130,10 @@ public class InstitutionForm implements TemplateComposer {
.newAction(ActionDefinition.INSTITUTION_NEW) .newAction(ActionDefinition.INSTITUTION_NEW)
.publishIf(() -> writeGrant && isReadonly) .publishIf(() -> writeGrant && isReadonly)
.newAction(ActionDefinition.USER_ACCOUNT_NEW) // Removed as discussed in SEBSERV-52
.withParentEntityKey(entityKey) // .newAction(ActionDefinition.USER_ACCOUNT_NEW)
.publishIf(() -> userWriteGrant && isReadonly && institution.isActive()) // .withParentEntityKey(entityKey)
// .publishIf(() -> userWriteGrant && isReadonly && institution.isActive())
.newAction(ActionDefinition.INSTITUTION_MODIFY) .newAction(ActionDefinition.INSTITUTION_MODIFY)
.withEntityKey(entityKey) .withEntityKey(entityKey)

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

@ -123,7 +123,6 @@ public class InstitutionList implements TemplateComposer {
// propagate content actions to action-pane // propagate content actions to action-pane
final GrantCheck instGrant = this.currentUser.grantCheck(EntityType.INSTITUTION); final GrantCheck instGrant = this.currentUser.grantCheck(EntityType.INSTITUTION);
final GrantCheck userGrant = this.currentUser.grantCheck(EntityType.USER);
pageActionBuilder pageActionBuilder
@ -149,12 +148,14 @@ public class InstitutionList implements TemplateComposer {
.withConfirm(this.pageService.confirmDeactivation(table)) .withConfirm(this.pageService.confirmDeactivation(table))
.publishIf(() -> instGrant.m() && table.hasAnyContent()) .publishIf(() -> instGrant.m() && table.hasAnyContent())
.newAction(ActionDefinition.INSTITUTION_USER_ACCOUNT_NEW) // Removed as discussed in SEBSERV-52
.withSelect( // .newAction(ActionDefinition.INSTITUTION_USER_ACCOUNT_NEW)
table::getSelection, // .withSelect(
PageAction::applySingleSelectionAsParentEntityKey, // table::getSelection,
EMPTY_SELECTION_TEXT_KEY) // PageAction::applySingleSelectionAsParentEntityKey,
.publishIf(() -> table.hasAnyContent() && userGrant.w()); // EMPTY_SELECTION_TEXT_KEY)
// .publishIf(() -> table.hasAnyContent() && userGrant.w())
;
} }
} }

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

@ -86,7 +86,7 @@ public class MainPage implements TemplateComposer {
mainSash, mainSash,
scrolledComposite -> { scrolledComposite -> {
final Composite reusult = new Composite(scrolledComposite, SWT.NONE); final Composite reusult = new Composite(scrolledComposite, SWT.NONE);
reusult.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); reusult.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
final GridLayout contentOuterlayout = new GridLayout(); final GridLayout contentOuterlayout = new GridLayout();
contentOuterlayout.marginHeight = 0; contentOuterlayout.marginHeight = 0;
contentOuterlayout.marginWidth = 0; contentOuterlayout.marginWidth = 0;

6
src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java
View file

@ -192,13 +192,15 @@ public class MonitoringClientConnection implements TemplateComposer {
.widthProportion(1)) .widthProportion(1))
.withColumn(new ColumnDefinition<>( .withColumn(new ColumnDefinition<>(
Domain.CLIENT_EVENT.ATTR_CLIENT_TIME, Domain.CLIENT_EVENT.ATTR_CLIENT_TIME,
LIST_COLUMN_CLIENT_TIME_KEY, new LocTextKey(LIST_COLUMN_CLIENT_TIME_KEY.name,
this.i18nSupport.getUsersTimeZoneTitleSuffix()),
this::getClientTime) this::getClientTime)
.sortable() .sortable()
.widthProportion(1)) .widthProportion(1))
.withColumn(new ColumnDefinition<>( .withColumn(new ColumnDefinition<>(
Domain.CLIENT_EVENT.ATTR_SERVER_TIME, Domain.CLIENT_EVENT.ATTR_SERVER_TIME,
LIST_COLUMN_SERVER_TIME_KEY, new LocTextKey(LIST_COLUMN_SERVER_TIME_KEY.name,
this.i18nSupport.getUsersTimeZoneTitleSuffix()),
this::getServerTime) this::getServerTime)
.sortable() .sortable()
.widthProportion(1)) .widthProportion(1))

42
src/main/java/ch/ethz/seb/sebserver/gui/content/QuizDiscoveryList.java
View file

@ -59,18 +59,12 @@ public class QuizDiscoveryList implements TemplateComposer {
// localized text keys // localized text keys
private static final LocTextKey QUIZ_DETAILS_URL_TEXT_KEY = private static final LocTextKey QUIZ_DETAILS_URL_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.quiz.details.url"); new LocTextKey("sebserver.quizdiscovery.quiz.details.url");
private static final LocTextKey QUIZ_DETAILS_ENDTIME_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.quiz.details.endtime");
private static final LocTextKey QUIZ_DETAILS_STARTTIME_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.quiz.details.starttime");
private static final LocTextKey QUIZ_DETAILS_DESCRIPTION_TEXT_KEY = private static final LocTextKey QUIZ_DETAILS_DESCRIPTION_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.quiz.details.description"); new LocTextKey("sebserver.quizdiscovery.quiz.details.description");
private static final LocTextKey QUIZ_DETAILS_NAME_TEXT_KEY = private static final LocTextKey QUIZ_DETAILS_START_TIME_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.quiz.details.name"); new LocTextKey("sebserver.quizdiscovery.quiz.details.starttime");
private static final LocTextKey QUIZ_DETAILS_INSTITUION_TEXT_KEY = private static final LocTextKey QUIZ_DETAILS_END_TIME_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.quiz.details.institution"); new LocTextKey("sebserver.quizdiscovery.quiz.details.endtime");
private static final LocTextKey QUIZ_DETAILS_LMS_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.quiz.details.lms");
private static final LocTextKey TITLE_TEXT_KEY = private static final LocTextKey TITLE_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.list.title"); new LocTextKey("sebserver.quizdiscovery.list.title");
private static final LocTextKey EMPTY_LIST_TEXT_KEY = private static final LocTextKey EMPTY_LIST_TEXT_KEY =
@ -83,6 +77,10 @@ public class QuizDiscoveryList implements TemplateComposer {
new LocTextKey("sebserver.quizdiscovery.list.column.lmssetup"); new LocTextKey("sebserver.quizdiscovery.list.column.lmssetup");
private final static LocTextKey NAME_TEXT_KEY = private final static LocTextKey NAME_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.list.column.name"); new LocTextKey("sebserver.quizdiscovery.list.column.name");
private final static LocTextKey START_TIME_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.list.column.starttime");
private final static LocTextKey END_TIME_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.list.column.endtime");
private final static LocTextKey DETAILS_TITLE_TEXT_KEY = private final static LocTextKey DETAILS_TITLE_TEXT_KEY =
new LocTextKey("sebserver.quizdiscovery.quiz.details.title"); new LocTextKey("sebserver.quizdiscovery.quiz.details.title");
private final static LocTextKey NO_IMPORT_OF_OUT_DATED_QUIZ = private final static LocTextKey NO_IMPORT_OF_OUT_DATED_QUIZ =
@ -176,7 +174,7 @@ public class QuizDiscoveryList implements TemplateComposer {
.withColumn(new ColumnDefinition<>( .withColumn(new ColumnDefinition<>(
QuizData.QUIZ_ATTR_START_TIME, QuizData.QUIZ_ATTR_START_TIME,
new LocTextKey( new LocTextKey(
"sebserver.quizdiscovery.list.column.starttime", START_TIME_TEXT_KEY.name,
i18nSupport.getUsersTimeZoneTitleSuffix()), i18nSupport.getUsersTimeZoneTitleSuffix()),
QuizData::getStartTime) QuizData::getStartTime)
.withFilter(new TableFilterAttribute( .withFilter(new TableFilterAttribute(
@ -190,7 +188,7 @@ public class QuizDiscoveryList implements TemplateComposer {
.withColumn(new ColumnDefinition<>( .withColumn(new ColumnDefinition<>(
QuizData.QUIZ_ATTR_END_TIME, QuizData.QUIZ_ATTR_END_TIME,
new LocTextKey( new LocTextKey(
"sebserver.quizdiscovery.list.column.endtime", END_TIME_TEXT_KEY.name,
i18nSupport.getUsersTimeZoneTitleSuffix()), i18nSupport.getUsersTimeZoneTitleSuffix()),
QuizData::getEndTime) QuizData::getEndTime)
.sortable()) .sortable())
@ -207,12 +205,12 @@ public class QuizDiscoveryList implements TemplateComposer {
.compose(pageContext.copyOf(content)); .compose(pageContext.copyOf(content));
// propagate content actions to action-pane // propagate content actions to action-pane
final GrantCheck lmsSetupGrant = currentUser.grantCheck(EntityType.LMS_SETUP);
final GrantCheck examGrant = currentUser.grantCheck(EntityType.EXAM); final GrantCheck examGrant = currentUser.grantCheck(EntityType.EXAM);
actionBuilder actionBuilder
.newAction(ActionDefinition.LMS_SETUP_NEW) // Removed as discussed in SEBSERV-52
.publishIf(lmsSetupGrant::iw) // .newAction(ActionDefinition.LMS_SETUP_NEW)
// .publishIf(lmsSetupGrant::iw)
.newAction(ActionDefinition.QUIZ_DISCOVERY_SHOW_DETAILS) .newAction(ActionDefinition.QUIZ_DISCOVERY_SHOW_DETAILS)
.withSelect( .withSelect(
@ -294,16 +292,16 @@ public class QuizDiscoveryList implements TemplateComposer {
() -> this.resourceService.getCurrentUser().get().hasRole(UserRole.SEB_SERVER_ADMIN), () -> this.resourceService.getCurrentUser().get().hasRole(UserRole.SEB_SERVER_ADMIN),
() -> FormBuilder.text( () -> FormBuilder.text(
QuizData.QUIZ_ATTR_INSTITUION_ID, QuizData.QUIZ_ATTR_INSTITUION_ID,
QUIZ_DETAILS_INSTITUION_TEXT_KEY, INSTITUION_TEXT_KEY,
institutionNameFunction.apply(quizData.getModelId()))) institutionNameFunction.apply(quizData.getModelId())))
.addField(FormBuilder.singleSelection( .addField(FormBuilder.singleSelection(
QuizData.QUIZ_ATTR_LMS_SETUP_ID, QuizData.QUIZ_ATTR_LMS_SETUP_ID,
QUIZ_DETAILS_LMS_TEXT_KEY, LMS_TEXT_KEY,
String.valueOf(quizData.lmsSetupId), String.valueOf(quizData.lmsSetupId),
() -> this.resourceService.lmsSetupResource())) () -> this.resourceService.lmsSetupResource()))
.addField(FormBuilder.text( .addField(FormBuilder.text(
QuizData.QUIZ_ATTR_NAME, QuizData.QUIZ_ATTR_NAME,
QUIZ_DETAILS_NAME_TEXT_KEY, NAME_TEXT_KEY,
quizData.name)) quizData.name))
.addField(FormBuilder.text( .addField(FormBuilder.text(
QuizData.QUIZ_ATTR_DESCRIPTION, QuizData.QUIZ_ATTR_DESCRIPTION,
@ -312,12 +310,12 @@ public class QuizDiscoveryList implements TemplateComposer {
.asHTML()) .asHTML())
.addField(FormBuilder.text( .addField(FormBuilder.text(
QuizData.QUIZ_ATTR_START_TIME, QuizData.QUIZ_ATTR_START_TIME,
QUIZ_DETAILS_STARTTIME_TEXT_KEY, QUIZ_DETAILS_START_TIME_TEXT_KEY,
this.widgetFactory.getI18nSupport().formatDisplayDate(quizData.startTime))) this.widgetFactory.getI18nSupport().formatDisplayDateWithTimeZone(quizData.startTime)))
.addField(FormBuilder.text( .addField(FormBuilder.text(
QuizData.QUIZ_ATTR_END_TIME, QuizData.QUIZ_ATTR_END_TIME,
QUIZ_DETAILS_ENDTIME_TEXT_KEY, QUIZ_DETAILS_END_TIME_TEXT_KEY,
this.widgetFactory.getI18nSupport().formatDisplayDate(quizData.endTime))) this.widgetFactory.getI18nSupport().formatDisplayDateWithTimeZone(quizData.endTime)))
.addField(FormBuilder.text( .addField(FormBuilder.text(
QuizData.QUIZ_ATTR_START_URL, QuizData.QUIZ_ATTR_START_URL,
QUIZ_DETAILS_URL_TEXT_KEY, QUIZ_DETAILS_URL_TEXT_KEY,

14
src/main/java/ch/ethz/seb/sebserver/gui/content/RegisterPage.java
View file

@ -19,8 +19,6 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpRequestFactory;
@ -38,7 +36,6 @@ import ch.ethz.seb.sebserver.gbl.util.Tuple;
import ch.ethz.seb.sebserver.gui.InstitutionalAuthenticationEntryPoint; import ch.ethz.seb.sebserver.gui.InstitutionalAuthenticationEntryPoint;
import ch.ethz.seb.sebserver.gui.form.FormBuilder; import ch.ethz.seb.sebserver.gui.form.FormBuilder;
import ch.ethz.seb.sebserver.gui.service.ResourceService; import ch.ethz.seb.sebserver.gui.service.ResourceService;
import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport;
import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; import ch.ethz.seb.sebserver.gui.service.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.PageService; import ch.ethz.seb.sebserver.gui.service.page.PageService;
@ -52,8 +49,6 @@ import ch.ethz.seb.sebserver.gui.widget.WidgetFactory;
@GuiProfile @GuiProfile
public class RegisterPage implements TemplateComposer { public class RegisterPage implements TemplateComposer {
private static final Logger log = LoggerFactory.getLogger(RegisterPage.class);
static final LocTextKey TITLE_TEXT_KEY = static final LocTextKey TITLE_TEXT_KEY =
new LocTextKey("sebserver.login.register.form.title"); new LocTextKey("sebserver.login.register.form.title");
static final LocTextKey FORM_PASSWORD_CONFIRM_TEXT_KEY = static final LocTextKey FORM_PASSWORD_CONFIRM_TEXT_KEY =
@ -70,6 +65,8 @@ public class RegisterPage implements TemplateComposer {
new LocTextKey("sebserver.useraccount.form.username"); new LocTextKey("sebserver.useraccount.form.username");
static final LocTextKey FORM_NAME_TEXT_KEY = static final LocTextKey FORM_NAME_TEXT_KEY =
new LocTextKey("sebserver.useraccount.form.name"); new LocTextKey("sebserver.useraccount.form.name");
static final LocTextKey FORM_SURNAME_TEXT_KEY =
new LocTextKey("sebserver.useraccount.form.surname");
static final LocTextKey FORM_INSTITUTION_TEXT_KEY = static final LocTextKey FORM_INSTITUTION_TEXT_KEY =
new LocTextKey("sebserver.useraccount.form.institution"); new LocTextKey("sebserver.useraccount.form.institution");
static final LocTextKey FORM_LANG_TEXT_KEY = static final LocTextKey FORM_LANG_TEXT_KEY =
@ -78,8 +75,6 @@ public class RegisterPage implements TemplateComposer {
private final PageService pageService; private final PageService pageService;
private final ResourceService resourceService; private final ResourceService resourceService;
private final WidgetFactory widgetFactory; private final WidgetFactory widgetFactory;
private final I18nSupport i18nSupport;
private final WebserviceURIService webserviceURIService;
private final RestTemplate restTemplate; private final RestTemplate restTemplate;
private final boolean multilingual; private final boolean multilingual;
@ -92,8 +87,6 @@ public class RegisterPage implements TemplateComposer {
this.pageService = pageService; this.pageService = pageService;
this.resourceService = pageService.getResourceService(); this.resourceService = pageService.getResourceService();
this.widgetFactory = pageService.getWidgetFactory(); this.widgetFactory = pageService.getWidgetFactory();
this.i18nSupport = pageService.getI18nSupport();
this.webserviceURIService = webserviceURIService;
this.multilingual = BooleanUtils.toBoolean(multilingual); this.multilingual = BooleanUtils.toBoolean(multilingual);
this.restTemplate = new RestTemplate(); this.restTemplate = new RestTemplate();
@ -148,6 +141,9 @@ public class RegisterPage implements TemplateComposer {
.addField(FormBuilder.text( .addField(FormBuilder.text(
Domain.USER.ATTR_NAME, Domain.USER.ATTR_NAME,
FORM_NAME_TEXT_KEY)) FORM_NAME_TEXT_KEY))
.addField(FormBuilder.text(
Domain.USER.ATTR_SURNAME,
FORM_SURNAME_TEXT_KEY))
.addField(FormBuilder.text( .addField(FormBuilder.text(
Domain.USER.ATTR_USERNAME, Domain.USER.ATTR_USERNAME,
FORM_USERNAME_TEXT_KEY)) FORM_USERNAME_TEXT_KEY))

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

@ -143,7 +143,7 @@ public class SebClientConfigForm implements TemplateComposer {
() -> FormBuilder.text( () -> FormBuilder.text(
Domain.SEB_CLIENT_CONFIGURATION.ATTR_DATE, Domain.SEB_CLIENT_CONFIGURATION.ATTR_DATE,
FORM_DATE_TEXT_KEY, FORM_DATE_TEXT_KEY,
i18nSupport.formatDisplayDate(clientConfig.date)) i18nSupport.formatDisplayDateWithTimeZone(clientConfig.date))
.readonly(true)) .readonly(true))
.addField(FormBuilder.text( .addField(FormBuilder.text(
Domain.SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET, Domain.SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET,

14
src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientLogs.java
View file

@ -197,7 +197,9 @@ public class SebClientLogs implements TemplateComposer {
.withColumn(new ColumnDefinition<>( .withColumn(new ColumnDefinition<>(
Domain.CLIENT_EVENT.ATTR_SERVER_TIME, Domain.CLIENT_EVENT.ATTR_SERVER_TIME,
TIME_TEXT_KEY, new LocTextKey(
TIME_TEXT_KEY.name,
this.i18nSupport.getUsersTimeZoneTitleSuffix()),
this::getEventTime) this::getEventTime)
.withFilter(new TableFilterAttribute( .withFilter(new TableFilterAttribute(
CriteriaType.DATE_TIME_RANGE, CriteriaType.DATE_TIME_RANGE,
@ -272,11 +274,13 @@ public class SebClientLogs implements TemplateComposer {
.addField(FormBuilder.text( .addField(FormBuilder.text(
Domain.CLIENT_EVENT.ATTR_CLIENT_TIME, Domain.CLIENT_EVENT.ATTR_CLIENT_TIME,
FORM_CLIENTTIME_TEXT_KEY, FORM_CLIENTTIME_TEXT_KEY,
this.i18nSupport.formatDisplayDateTime(clientEvent.clientTime))) this.i18nSupport.formatDisplayDateTime(clientEvent.clientTime) + " " +
this.i18nSupport.getUsersTimeZoneTitleSuffix()))
.addField(FormBuilder.text( .addField(FormBuilder.text(
Domain.CLIENT_EVENT.ATTR_SERVER_TIME, Domain.CLIENT_EVENT.ATTR_SERVER_TIME,
FORM_SERVERTIME_TEXT_KEY, FORM_SERVERTIME_TEXT_KEY,
this.i18nSupport.formatDisplayDateTime(clientEvent.serverTime))) this.i18nSupport.formatDisplayDateTime(clientEvent.serverTime) + " " +
this.i18nSupport.getUsersTimeZoneTitleSuffix()))
.addField(FormBuilder.text( .addField(FormBuilder.text(
Domain.CLIENT_EVENT.ATTR_NUMERIC_VALUE, Domain.CLIENT_EVENT.ATTR_NUMERIC_VALUE,
FORM_VALUE_TEXT_KEY, FORM_VALUE_TEXT_KEY,
@ -357,11 +361,11 @@ public class SebClientLogs implements TemplateComposer {
.addField(FormBuilder.text( .addField(FormBuilder.text(
QuizData.QUIZ_ATTR_START_TIME, QuizData.QUIZ_ATTR_START_TIME,
FORM_START_TIME_TEXT_KEY, FORM_START_TIME_TEXT_KEY,
this.i18nSupport.formatDisplayDateTime(exam.startTime))) this.i18nSupport.formatDisplayDateWithTimeZone(exam.startTime)))
.addField(FormBuilder.text( .addField(FormBuilder.text(
QuizData.QUIZ_ATTR_END_TIME, QuizData.QUIZ_ATTR_END_TIME,
FORM_END_TIME_TEXT_KEY, FORM_END_TIME_TEXT_KEY,
this.i18nSupport.formatDisplayDateTime(exam.endTime))) this.i18nSupport.formatDisplayDateWithTimeZone(exam.endTime)))
.build(); .build();
} }

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

@ -74,6 +74,8 @@ public class UserAccountForm implements TemplateComposer {
new LocTextKey("sebserver.useraccount.form.username"); new LocTextKey("sebserver.useraccount.form.username");
static final LocTextKey FORM_NAME_TEXT_KEY = static final LocTextKey FORM_NAME_TEXT_KEY =
new LocTextKey("sebserver.useraccount.form.name"); new LocTextKey("sebserver.useraccount.form.name");
static final LocTextKey FORM_SURNAME_TEXT_KEY =
new LocTextKey("sebserver.useraccount.form.surname");
static final LocTextKey FORM_INSTITUTION_TEXT_KEY = static final LocTextKey FORM_INSTITUTION_TEXT_KEY =
new LocTextKey("sebserver.useraccount.form.institution"); new LocTextKey("sebserver.useraccount.form.institution");
static final LocTextKey FORM_LANG_TEXT_KEY = static final LocTextKey FORM_LANG_TEXT_KEY =
@ -172,6 +174,10 @@ public class UserAccountForm implements TemplateComposer {
Domain.USER.ATTR_NAME, Domain.USER.ATTR_NAME,
FORM_NAME_TEXT_KEY, FORM_NAME_TEXT_KEY,
userAccount.getName())) userAccount.getName()))
.addField(FormBuilder.text(
Domain.USER.ATTR_SURNAME,
FORM_SURNAME_TEXT_KEY,
userAccount.getSurname()))
.addField(FormBuilder.text( .addField(FormBuilder.text(
Domain.USER.ATTR_USERNAME, Domain.USER.ATTR_USERNAME,
FORM_USERNAME_TEXT_KEY, FORM_USERNAME_TEXT_KEY,
@ -194,7 +200,7 @@ public class UserAccountForm implements TemplateComposer {
this.resourceService::timeZoneResources)) this.resourceService::timeZoneResources))
.addFieldIf( .addFieldIf(
() -> modifyGrant, () -> modifyGrant,
() -> FormBuilder.multiSelection( () -> FormBuilder.multiCheckboxSelection(
USER_ROLE.REFERENCE_NAME, USER_ROLE.REFERENCE_NAME,
FORM_ROLES_TEXT_KEY, FORM_ROLES_TEXT_KEY,
StringUtils.join(userAccount.getRoles(), Constants.LIST_SEPARATOR_CHAR), StringUtils.join(userAccount.getRoles(), Constants.LIST_SEPARATOR_CHAR),
@ -248,7 +254,6 @@ public class UserAccountForm implements TemplateComposer {
.map(userInfo -> { .map(userInfo -> {
if (ownAccount) { if (ownAccount) {
currentUser.refresh(userInfo); currentUser.refresh(userInfo);
pageContext.forwardToMainPage();
} }
return userInfo; return userInfo;
}), }),

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

@ -11,6 +11,7 @@ package ch.ethz.seb.sebserver.gui.content;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
import java.util.function.Function; import java.util.function.Function;
import org.apache.commons.lang3.BooleanUtils;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
@ -87,15 +88,18 @@ public class UserAccountList implements TemplateComposer {
private final PageService pageService; private final PageService pageService;
private final ResourceService resourceService; private final ResourceService resourceService;
private final int pageSize; private final int pageSize;
private final boolean multilingual;
protected UserAccountList( protected UserAccountList(
final PageService pageService, final PageService pageService,
final ResourceService resourceService, final ResourceService resourceService,
@Value("${sebserver.gui.list.page.size:20}") final Integer pageSize) { @Value("${sebserver.gui.list.page.size:20}") final Integer pageSize,
@Value("${sebserver.gui.multilingual:false}") final Boolean ml) {
this.pageService = pageService; this.pageService = pageService;
this.resourceService = resourceService; this.resourceService = resourceService;
this.pageSize = pageSize; this.pageSize = pageSize;
this.multilingual = BooleanUtils.isTrue(ml);
this.institutionFilter = new TableFilterAttribute( this.institutionFilter = new TableFilterAttribute(
CriteriaType.SINGLE_SELECTION, CriteriaType.SINGLE_SELECTION,
@ -165,7 +169,8 @@ public class UserAccountList implements TemplateComposer {
.sortable() .sortable()
.widthProportion(3)) .widthProportion(3))
.withColumn(new ColumnDefinition<>( .withColumnIf(() -> this.multilingual,
() -> new ColumnDefinition<>(
Domain.USER.ATTR_LANGUAGE, Domain.USER.ATTR_LANGUAGE,
LANG_TEXT_KEY, LANG_TEXT_KEY,
this::getLocaleDisplayText) this::getLocaleDisplayText)

9
src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java
View file

@ -63,6 +63,8 @@ public class UserActivityLogs implements TemplateComposer {
new LocTextKey("sebserver.userlogs.list.column.user"); new LocTextKey("sebserver.userlogs.list.column.user");
private static final LocTextKey DATE_TEXT_KEY = private static final LocTextKey DATE_TEXT_KEY =
new LocTextKey("sebserver.userlogs.list.column.dateTime"); new LocTextKey("sebserver.userlogs.list.column.dateTime");
private static final LocTextKey DETAILS_DATE_TEXT_KEY =
new LocTextKey("sebserver.seblogs.details.dateTime");
private static final LocTextKey ACTIVITY_TEXT_KEY = private static final LocTextKey ACTIVITY_TEXT_KEY =
new LocTextKey("sebserver.userlogs.list.column.activityType"); new LocTextKey("sebserver.userlogs.list.column.activityType");
private static final LocTextKey ENTITY_TYPE_TEXT_KEY = private static final LocTextKey ENTITY_TYPE_TEXT_KEY =
@ -179,7 +181,7 @@ public class UserActivityLogs implements TemplateComposer {
.withColumn(new ColumnDefinition<>( .withColumn(new ColumnDefinition<>(
Domain.USER_ACTIVITY_LOG.ATTR_TIMESTAMP, Domain.USER_ACTIVITY_LOG.ATTR_TIMESTAMP,
DATE_TEXT_KEY, new LocTextKey(DATE_TEXT_KEY.name, this.i18nSupport.getUsersTimeZoneTitleSuffix()),
this::getLogTime) this::getLogTime)
.withFilter(new TableFilterAttribute( .withFilter(new TableFilterAttribute(
CriteriaType.DATE_RANGE, CriteriaType.DATE_RANGE,
@ -259,9 +261,10 @@ public class UserActivityLogs implements TemplateComposer {
userActivityLog.entityId)) userActivityLog.entityId))
.addField(FormBuilder.text( .addField(FormBuilder.text(
Domain.USER_ACTIVITY_LOG.ATTR_TIMESTAMP, Domain.USER_ACTIVITY_LOG.ATTR_TIMESTAMP,
DATE_TEXT_KEY, DETAILS_DATE_TEXT_KEY,
this.widgetFactory.getI18nSupport() this.widgetFactory.getI18nSupport()
.formatDisplayDateTime(Utils.toDateTimeUTC(userActivityLog.timestamp)))) .formatDisplayDateTime(Utils.toDateTimeUTC(userActivityLog.timestamp)) + " " +
this.i18nSupport.getUsersTimeZoneTitleSuffix()))
.addField(FormBuilder.text( .addField(FormBuilder.text(
Domain.USER_ACTIVITY_LOG.ATTR_MESSAGE, Domain.USER_ACTIVITY_LOG.ATTR_MESSAGE,
MESSAGE_TEXT_KEY, MESSAGE_TEXT_KEY,

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

@ -27,7 +27,7 @@ public enum ActionCategory {
CLIENT_EVENT_LIST(new LocTextKey("sebserver.monitoring.exam.connection.list.actions"), 1), CLIENT_EVENT_LIST(new LocTextKey("sebserver.monitoring.exam.connection.list.actions"), 1),
LOGS_USER_ACTIVITY_LIST(new LocTextKey("sebserver.userlogs.list.actions"), 1), LOGS_USER_ACTIVITY_LIST(new LocTextKey("sebserver.userlogs.list.actions"), 1),
LOGS_SEB_CLIENT_LIST(new LocTextKey("sebserver.userlogs.list.actions"), 1), LOGS_SEB_CLIENT_LIST(new LocTextKey("sebserver.userlogs.list.actions"), 1),
VARIA(new LocTextKey("sebserver.overall.action.category.varia"), 100), VARIA(new LocTextKey("sebserver.overall.action.category.varia"), 0),
FILTER(new LocTextKey("sebserver.overall.action.category.filter"), 50); FILTER(new LocTextKey("sebserver.overall.action.category.filter"), 50);
public final LocTextKey title; public final LocTextKey title;

15
src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java
View file

@ -12,6 +12,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.RWT;
import org.eclipse.rap.rwt.template.ImageCell; import org.eclipse.rap.rwt.template.ImageCell;
import org.eclipse.rap.rwt.template.Template; import org.eclipse.rap.rwt.template.Template;
@ -44,6 +45,7 @@ import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.CustomVariant;
public class ActionPane implements TemplateComposer { public class ActionPane implements TemplateComposer {
private static final String ACTION_EVENT_CALL_KEY = "ACTION_EVENT_CALL"; private static final String ACTION_EVENT_CALL_KEY = "ACTION_EVENT_CALL";
private static final LocTextKey TITLE_KEY = new LocTextKey("sebserver.actionpane.title");
private final PageService pageService; private final PageService pageService;
private final WidgetFactory widgetFactory; private final WidgetFactory widgetFactory;
@ -61,11 +63,14 @@ public class ActionPane implements TemplateComposer {
final Label label = this.widgetFactory.labelLocalized( final Label label = this.widgetFactory.labelLocalized(
pageContext.getParent(), pageContext.getParent(),
CustomVariant.TEXT_H2, CustomVariant.TEXT_H2,
new LocTextKey("sebserver.actionpane.title")); TITLE_KEY);
final GridData titleLayout = new GridData(SWT.FILL, SWT.TOP, true, false); final GridData titleLayout = new GridData(SWT.FILL, SWT.TOP, true, false);
titleLayout.verticalIndent = 10; titleLayout.verticalIndent = 10;
titleLayout.horizontalIndent = 10; titleLayout.horizontalIndent = 10;
if (StringUtils.isBlank(label.getText())) {
titleLayout.heightHint = 0;
}
label.setLayoutData(titleLayout); label.setLayoutData(titleLayout);
label.setData( label.setData(
@ -107,7 +112,9 @@ public class ActionPane implements TemplateComposer {
final Composite composite = new Composite(parent, SWT.NONE); final Composite composite = new Composite(parent, SWT.NONE);
final GridData layout = new GridData(SWT.FILL, SWT.TOP, true, false); final GridData layout = new GridData(SWT.FILL, SWT.TOP, true, false);
composite.setLayoutData(layout); composite.setLayoutData(layout);
composite.setLayout(new GridLayout()); final GridLayout gridLayout = new GridLayout();
gridLayout.marginHeight = 0;
composite.setLayout(gridLayout);
composite.setData(RWT.CUSTOM_VARIANT, "actionPane"); composite.setData(RWT.CUSTOM_VARIANT, "actionPane");
composite.setData("CATEGORY", category); composite.setData("CATEGORY", category);
@ -121,14 +128,12 @@ public class ActionPane implements TemplateComposer {
} }
// title // title
if (category.title != null) { if (this.pageService.getI18nSupport().hasText(category.title)) {
final Label actionsTitle = this.widgetFactory.labelLocalized( final Label actionsTitle = this.widgetFactory.labelLocalized(
composite, composite,
CustomVariant.TEXT_H3, CustomVariant.TEXT_H3,
category.title); category.title);
final GridData titleLayout = new GridData(SWT.FILL, SWT.TOP, true, false); final GridData titleLayout = new GridData(SWT.FILL, SWT.TOP, true, false);
titleLayout.horizontalIndent = 10;
titleLayout.verticalIndent = 10;
actionsTitle.setLayoutData(titleLayout); actionsTitle.setLayoutData(titleLayout);
} }

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

@ -47,6 +47,7 @@ public class ActivitiesPane implements TemplateComposer {
private static final String SKIP_EXPAND = "SKIP_EXPAND"; private static final String SKIP_EXPAND = "SKIP_EXPAND";
private static final String ATTR_ACTIVITY_SELECTION = "ACTIVITY_SELECTION"; private static final String ATTR_ACTIVITY_SELECTION = "ACTIVITY_SELECTION";
private static final LocTextKey TITLE_KEY = new LocTextKey("sebserver.activitiespane.title");
private final WidgetFactory widgetFactory; private final WidgetFactory widgetFactory;
private final CurrentUser currentUser; private final CurrentUser currentUser;
@ -66,13 +67,15 @@ public class ActivitiesPane implements TemplateComposer {
final UserInfo userInfo = this.currentUser final UserInfo userInfo = this.currentUser
.getOrHandleError(t -> this.pageService.logoutOnError(t, pageContext)); .getOrHandleError(t -> this.pageService.logoutOnError(t, pageContext));
if (this.pageService.getI18nSupport().hasText(TITLE_KEY)) {
final Label activities = this.widgetFactory.labelLocalized( final Label activities = this.widgetFactory.labelLocalized(
pageContext.getParent(), pageContext.getParent(),
CustomVariant.TEXT_H2, CustomVariant.TEXT_H2,
new LocTextKey("sebserver.activitiespane.title")); TITLE_KEY);
final GridData activitiesGridData = new GridData(SWT.FILL, SWT.TOP, true, false); final GridData activitiesGridData = new GridData(SWT.FILL, SWT.TOP, true, false);
activitiesGridData.horizontalIndent = 20; activitiesGridData.horizontalIndent = 20;
activities.setLayoutData(activitiesGridData); activities.setLayoutData(activitiesGridData);
}
final Tree navigation = this.widgetFactory.treeLocalized( final Tree navigation = this.widgetFactory.treeLocalized(
pageContext.getParent(), pageContext.getParent(),

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

@ -313,6 +313,7 @@ public final class Form implements FormBinding {
switch (selection.type()) { switch (selection.type()) {
case MULTI: case MULTI:
case MULTI_COMBO: case MULTI_COMBO:
case MULTI_CHECKBOX:
return createAccessor(label, selection, Form::adaptCommaSeparatedStringToJsonArray, errorLabel); return createAccessor(label, selection, Form::adaptCommaSeparatedStringToJsonArray, errorLabel);
default : return createAccessor(label, selection, null, errorLabel); default : return createAccessor(label, selection, null, errorLabel);
} }

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

@ -237,6 +237,15 @@ public class FormBuilder {
return new SelectionFieldBuilder(Selection.Type.MULTI, name, label, value, itemsSupplier); return new SelectionFieldBuilder(Selection.Type.MULTI, name, label, value, itemsSupplier);
} }
public static SelectionFieldBuilder multiCheckboxSelection(
final String name,
final LocTextKey label,
final String value,
final Supplier<List<Tuple<String>>> itemsSupplier) {
return new SelectionFieldBuilder(Selection.Type.MULTI_CHECKBOX, name, label, value, itemsSupplier);
}
public static SelectionFieldBuilder multiComboSelection( public static SelectionFieldBuilder multiComboSelection(
final String name, final String name,
final LocTextKey label, final LocTextKey label,

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

@ -94,7 +94,7 @@ public final class SelectionFieldBuilder extends FieldBuilder<String> {
/* Build the read-only representation of the selection field */ /* Build the read-only representation of the selection field */
private void buildReadOnly(final FormBuilder builder, final Label titleLabel) { private void buildReadOnly(final FormBuilder builder, final Label titleLabel) {
if (this.type == Type.MULTI || this.type == Type.MULTI_COMBO) { if (this.type == Type.MULTI || this.type == Type.MULTI_COMBO || this.type == Type.MULTI_CHECKBOX) {
final Composite composite = new Composite(builder.formParent, SWT.NONE); final Composite composite = new Composite(builder.formParent, SWT.NONE);
final GridLayout gridLayout = new GridLayout(1, true); final GridLayout gridLayout = new GridLayout(1, true);
//gridLayout.verticalSpacing = 5; //gridLayout.verticalSpacing = 5;

2
src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java
View file

@ -349,7 +349,7 @@ public class ResourceService {
return DateTimeZone return DateTimeZone
.getAvailableIDs() .getAvailableIDs()
.stream() .stream()
.map(id -> new Tuple<>(id, DateTimeZone.forID(id).getName(0, currentLocale) + " (" + id + ")")) .map(id -> new Tuple<>(id, id + " (" + DateTimeZone.forID(id).getName(0, currentLocale) + ")"))
.sorted(RESOURCE_COMPARATOR) .sorted(RESOURCE_COMPARATOR)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }

14
src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/I18nSupport.java
View file

@ -34,12 +34,24 @@ public interface I18nSupport {
* This uses the date-format defined by either the attribute 'sebserver.gui.date.displayformat' * This uses the date-format defined by either the attribute 'sebserver.gui.date.displayformat'
* or the Constants.DEFAULT_DISPLAY_DATE_FORMAT * or the Constants.DEFAULT_DISPLAY_DATE_FORMAT
* *
* Adds time-zone information if the currents user time-zone is different form UTC * Adds time-zone offset information if the currents user time-zone is different form UTC
* *
* @param date the DateTime instance * @param date the DateTime instance
* @return date formatted date String to display */ * @return date formatted date String to display */
String formatDisplayDate(DateTime date); String formatDisplayDate(DateTime date);
/** Format a DateTime to a text format to display with additional time zone name at the end.
* This uses the date-format defined by either the attribute 'sebserver.gui.date.displayformat'
* or the Constants.DEFAULT_DISPLAY_DATE_FORMAT
*
* Adds time-zone offset information if the currents user time-zone is different form UTC
*
* @param date the DateTime instance
* @return date formatted date String to display */
default String formatDisplayDateWithTimeZone(final DateTime date) {
return formatDisplayDate(date) + " " + this.getUsersTimeZoneTitleSuffix();
}
/** Format a time-stamp (milliseconds) to a text format to display. /** Format a time-stamp (milliseconds) to a text format to display.
* This uses the date-format defined by either the attribute 'sebserver.gui.date.displayformat' * This uses the date-format defined by either the attribute 'sebserver.gui.date.displayformat'
* or the Constants.DEFAULT_DISPLAY_DATE_FORMAT * or the Constants.DEFAULT_DISPLAY_DATE_FORMAT

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

@ -50,6 +50,7 @@ public class I18nSupportImpl implements I18nSupport {
private static final String DATE_DISPLAYFORMAT_TIMEZONE_KEY = "sebserver.gui.date.displayformat.timezone"; private static final String DATE_DISPLAYFORMAT_TIMEZONE_KEY = "sebserver.gui.date.displayformat.timezone";
private static final String ATTR_CURRENT_SESSION_LOCALE = "CURRENT_SESSION_LOCALE"; private static final String ATTR_CURRENT_SESSION_LOCALE = "CURRENT_SESSION_LOCALE";
@SuppressWarnings("unused")
private final DateTimeFormatter timeZoneFormatter; private final DateTimeFormatter timeZoneFormatter;
private final DateTimeFormatter displayDateFormatter; private final DateTimeFormatter displayDateFormatter;
private final DateTimeFormatter displayDateTimeFormatter; private final DateTimeFormatter displayDateTimeFormatter;
@ -171,7 +172,7 @@ public class I18nSupportImpl implements I18nSupport {
if (userInfo.timeZone == null || userInfo.timeZone.equals(DateTimeZone.UTC)) { if (userInfo.timeZone == null || userInfo.timeZone.equals(DateTimeZone.UTC)) {
return ""; return "";
} else { } else {
return "(UTC|" + this.currentUser.get().timeZone.getID() + ")"; return "(" + this.currentUser.get().timeZone.getID() + ")";
} }
} }
@ -191,7 +192,7 @@ public class I18nSupportImpl implements I18nSupport {
return false; return false;
} }
return getText(key.name, (String) null) != null; return StringUtils.isNotBlank(getText(key.name, (String) null));
} }
private String formatDisplayDate(final DateTime date, final DateTimeFormatter formatter) { private String formatDisplayDate(final DateTime date, final DateTimeFormatter formatter) {
@ -206,15 +207,11 @@ public class I18nSupportImpl implements I18nSupport {
dateUTC = date.withZone(DateTimeZone.UTC); dateUTC = date.withZone(DateTimeZone.UTC);
} }
final String dateTimeStringUTC = dateUTC.toString(formatter);
final UserInfo userInfo = this.currentUser.get(); final UserInfo userInfo = this.currentUser.get();
if (userInfo != null && userInfo.timeZone != null && !userInfo.timeZone.equals(DateTimeZone.UTC)) { if (userInfo != null && userInfo.timeZone != null && !userInfo.timeZone.equals(DateTimeZone.UTC)) {
return dateUTC.toString(formatter.withZone(userInfo.timeZone));
return dateTimeStringUTC + dateUTC
.withZone(userInfo.timeZone)
.toString(this.timeZoneFormatter);
} else { } else {
return dateTimeStringUTC; return dateUTC.toString(formatter);
} }
} }

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

@ -32,6 +32,7 @@ import org.springframework.util.MultiValueMap;
import ch.ethz.seb.sebserver.gbl.Constants; import ch.ethz.seb.sebserver.gbl.Constants;
import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.Entity;
import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
import ch.ethz.seb.sebserver.gbl.util.Tuple; import ch.ethz.seb.sebserver.gbl.util.Tuple;
import ch.ethz.seb.sebserver.gbl.util.Utils; import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey;
@ -200,8 +201,8 @@ public class TableFilter<ROW extends Entity> {
inner.setLayout(gridLayout); inner.setLayout(gridLayout);
inner.setLayoutData(new RowData()); inner.setLayoutData(new RowData());
final GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, true); final GridData gridData = new GridData(SWT.FILL, SWT.BOTTOM, true, true);
gridData.heightHint = 20;
final Label imageButton = this.entityTable.widgetFactory.imageButton( final Label imageButton = this.entityTable.widgetFactory.imageButton(
ImageIcon.SEARCH, ImageIcon.SEARCH,
inner, inner,
@ -411,9 +412,15 @@ public class TableFilter<ROW extends Entity> {
private class Date extends FilterComponent { private class Date extends FilterComponent {
private DateTime selector; private DateTime selector;
private final DateTimeZone timeZone;
Date(final TableFilterAttribute attribute) { Date(final TableFilterAttribute attribute) {
super(attribute); super(attribute);
final UserInfo userInfo = TableFilter.this.entityTable.pageService.getCurrentUser().get();
this.timeZone =
(userInfo != null && userInfo.timeZone != null && !userInfo.timeZone.equals(DateTimeZone.UTC))
? userInfo.timeZone
: DateTimeZone.UTC;
} }
@Override @Override
@ -440,7 +447,7 @@ public class TableFilter<ROW extends Entity> {
@Override @Override
String getValue() { String getValue() {
if (this.selector != null) { if (this.selector != null) {
final org.joda.time.DateTime date = org.joda.time.DateTime.now(DateTimeZone.UTC) final org.joda.time.DateTime date = org.joda.time.DateTime.now(this.timeZone)
.withYear(this.selector.getYear()) .withYear(this.selector.getYear())
.withMonthOfYear(this.selector.getMonth() + 1) .withMonthOfYear(this.selector.getMonth() + 1)
.withDayOfMonth(this.selector.getDay()) .withDayOfMonth(this.selector.getDay())
@ -456,7 +463,9 @@ public class TableFilter<ROW extends Entity> {
void setValue(final String value) { void setValue(final String value) {
if (this.selector != null) { if (this.selector != null) {
try { try {
final org.joda.time.DateTime date = Utils.toDateTime(value); final org.joda.time.DateTime date = new org.joda.time.DateTime(
Utils.toDateTime(value),
this.timeZone);
this.selector.setDate(date.getYear(), date.getMonthOfYear() - 1, date.getDayOfMonth()); this.selector.setDate(date.getYear(), date.getMonthOfYear() - 1, date.getDayOfMonth());
} catch (final Exception e) { } catch (final Exception e) {
log.error("Failed to set date filter attribute: ", e); log.error("Failed to set date filter attribute: ", e);
@ -482,6 +491,7 @@ public class TableFilter<ROW extends Entity> {
private DateTime fromTimeSelector; private DateTime fromTimeSelector;
private DateTime toTimeSelector; private DateTime toTimeSelector;
private final boolean withTime; private final boolean withTime;
private final DateTimeZone timeZone;
DateRange(final TableFilterAttribute attribute) { DateRange(final TableFilterAttribute attribute) {
this(attribute, false); this(attribute, false);
@ -490,6 +500,11 @@ public class TableFilter<ROW extends Entity> {
DateRange(final TableFilterAttribute attribute, final boolean withTime) { DateRange(final TableFilterAttribute attribute, final boolean withTime) {
super(attribute); super(attribute);
this.withTime = withTime; this.withTime = withTime;
final UserInfo userInfo = TableFilter.this.entityTable.pageService.getCurrentUser().get();
this.timeZone =
(userInfo != null && userInfo.timeZone != null && !userInfo.timeZone.equals(DateTimeZone.UTC))
? userInfo.timeZone
: DateTimeZone.UTC;
} }
@Override @Override
@ -521,10 +536,12 @@ public class TableFilter<ROW extends Entity> {
@Override @Override
FilterComponent reset() { FilterComponent reset() {
final org.joda.time.DateTime now = org.joda.time.DateTime.now(DateTimeZone.UTC); final org.joda.time.DateTime now = org.joda.time.DateTime.now(this.timeZone);
if (this.fromDateSelector != null) { if (this.fromDateSelector != null) {
try { try {
final org.joda.time.DateTime parse = org.joda.time.DateTime.parse(this.attribute.initValue); final org.joda.time.DateTime parse = new org.joda.time.DateTime(
org.joda.time.DateTime.parse(this.attribute.initValue),
this.timeZone);
this.fromDateSelector.setDate( this.fromDateSelector.setDate(
parse.getYear(), parse.getYear(),
@ -568,14 +585,14 @@ public class TableFilter<ROW extends Entity> {
@Override @Override
String getValue() { String getValue() {
if (this.fromDateSelector != null && this.toDateSelector != null) { if (this.fromDateSelector != null && this.toDateSelector != null) {
org.joda.time.DateTime fromDate = org.joda.time.DateTime.now(DateTimeZone.UTC) org.joda.time.DateTime fromDate = org.joda.time.DateTime.now(this.timeZone)
.withYear(this.fromDateSelector.getYear()) .withYear(this.fromDateSelector.getYear())
.withMonthOfYear(this.fromDateSelector.getMonth() + 1) .withMonthOfYear(this.fromDateSelector.getMonth() + 1)
.withDayOfMonth(this.fromDateSelector.getDay()) .withDayOfMonth(this.fromDateSelector.getDay())
.withHourOfDay((this.fromTimeSelector != null) ? this.fromTimeSelector.getHours() : 0) .withHourOfDay((this.fromTimeSelector != null) ? this.fromTimeSelector.getHours() : 0)
.withMinuteOfHour((this.fromTimeSelector != null) ? this.fromTimeSelector.getMinutes() : 0) .withMinuteOfHour((this.fromTimeSelector != null) ? this.fromTimeSelector.getMinutes() : 0)
.withSecondOfMinute((this.fromTimeSelector != null) ? this.fromTimeSelector.getSeconds() : 0); .withSecondOfMinute((this.fromTimeSelector != null) ? this.fromTimeSelector.getSeconds() : 0);
org.joda.time.DateTime toDate = org.joda.time.DateTime.now(DateTimeZone.UTC) org.joda.time.DateTime toDate = org.joda.time.DateTime.now(this.timeZone)
.withYear(this.toDateSelector.getYear()) .withYear(this.toDateSelector.getYear())
.withMonthOfYear(this.toDateSelector.getMonth() + 1) .withMonthOfYear(this.toDateSelector.getMonth() + 1)
.withDayOfMonth(this.toDateSelector.getDay()) .withDayOfMonth(this.toDateSelector.getDay())
@ -603,8 +620,10 @@ public class TableFilter<ROW extends Entity> {
if (this.fromDateSelector != null && this.toDateSelector != null) { if (this.fromDateSelector != null && this.toDateSelector != null) {
try { try {
final String[] split = StringUtils.split(value, Constants.EMBEDDED_LIST_SEPARATOR); final String[] split = StringUtils.split(value, Constants.EMBEDDED_LIST_SEPARATOR);
final org.joda.time.DateTime fromDate = Utils.toDateTime(split[0]); final org.joda.time.DateTime fromDate =
final org.joda.time.DateTime toDate = Utils.toDateTime(split[1]); new org.joda.time.DateTime(Utils.toDateTime(split[0]), this.timeZone);
final org.joda.time.DateTime toDate =
new org.joda.time.DateTime(Utils.toDateTime(split[1]), this.timeZone);
this.fromDateSelector.setDate( this.fromDateSelector.setDate(
fromDate.getYear(), fromDate.getYear(),
fromDate.getMonthOfYear() - 1, fromDate.getMonthOfYear() - 1,

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

@ -10,12 +10,8 @@ package ch.ethz.seb.sebserver.gui.table;
import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.RWT;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.layout.RowData;
import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
@ -35,7 +31,6 @@ public class TableNavigator {
final GridData gridData = new GridData(SWT.LEFT, SWT.CENTER, true, true); final GridData gridData = new GridData(SWT.LEFT, SWT.CENTER, true, true);
this.composite.setLayoutData(gridData); this.composite.setLayoutData(gridData);
final GridLayout layout = new GridLayout(3, false); final GridLayout layout = new GridLayout(3, false);
layout.marginLeft = 10;
this.composite.setLayout(layout); this.composite.setLayout(layout);
this.entityTable = entityTable; this.entityTable = entityTable;
@ -68,7 +63,7 @@ public class TableNavigator {
final Composite numNav = new Composite(this.composite, SWT.NONE); final Composite numNav = new Composite(this.composite, SWT.NONE);
final GridData gridData = new GridData(SWT.CENTER, SWT.TOP, true, false); final GridData gridData = new GridData(SWT.CENTER, SWT.TOP, true, false);
numNav.setLayoutData(gridData); numNav.setLayoutData(gridData);
final RowLayout rowLayout = new RowLayout(SWT.HORIZONTAL); final GridLayout rowLayout = new GridLayout(PAGE_NAV_SIZE + 5, true);
numNav.setLayout(rowLayout); numNav.setLayout(rowLayout);
if (numberOfPages > 1) { if (numberOfPages > 1) {
@ -89,7 +84,7 @@ public class TableNavigator {
createPageNumberLabel(i, i != pageNumber, numNav); createPageNumberLabel(i, i != pageNumber, numNav);
} }
createForwardLabel(pageNumber < numberOfPages, pageNumber, numNav); createForwardLabel(pageNumber < numberOfPages, pageNumber, numberOfPages, numNav);
} }
return pageData; return pageData;
@ -97,10 +92,10 @@ public class TableNavigator {
private void createPagingHeader(final int page, final int of) { private void createPagingHeader(final int page, final int of) {
final Label pageHeader = new Label(this.composite, SWT.NONE); final Label pageHeader = new Label(this.composite, SWT.NONE);
final GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, true); final GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, true, false);
gridData.widthHint = 100; gridData.widthHint = 100;
gridData.minimumWidth = 100; gridData.minimumWidth = 100;
gridData.verticalAlignment = SWT.CENTER; gridData.heightHint = 16;
pageHeader.setLayoutData(gridData); pageHeader.setLayoutData(gridData);
pageHeader.setText("Page " + page + " / " + of); pageHeader.setText("Page " + page + " / " + of);
} }
@ -110,28 +105,31 @@ public class TableNavigator {
final boolean selectable, final boolean selectable,
final Composite parent) { final Composite parent) {
final GridData rowData = new GridData(22, 16);
final Label pageLabel = new Label(parent, SWT.NONE); final Label pageLabel = new Label(parent, SWT.NONE);
pageLabel.setText(" " + String.valueOf(page) + " "); pageLabel.setText(" " + String.valueOf(page) + " ");
pageLabel.setLayoutData(new RowData(22, 16)); pageLabel.setLayoutData(rowData);
pageLabel.setAlignment(SWT.CENTER); pageLabel.setAlignment(SWT.CENTER);
if (selectable) { if (selectable) {
pageLabel.setData(RWT.CUSTOM_VARIANT, "action"); pageLabel.setData(RWT.CUSTOM_VARIANT, CustomVariant.LIST_NAVIGATION.key);
pageLabel.addListener(SWT.MouseDown, event -> { pageLabel.addListener(SWT.MouseDown, event -> {
this.entityTable.selectPage(page); this.entityTable.selectPage(page);
}); });
pageLabel.setBackground(new Color(parent.getDisplay(), new RGB(245, 245, 245)));
} }
} }
private void createForwardLabel( private void createForwardLabel(
final boolean visible, final boolean visible,
final int pageNumber, final int pageNumber,
final int numberOfPages,
final Composite parent) { final Composite parent) {
final GridData rowData = new GridData(22, 16);
final Label forward = new Label(parent, SWT.NONE); final Label forward = new Label(parent, SWT.NONE);
forward.setText(">"); forward.setText(">");
forward.setData(RWT.CUSTOM_VARIANT, "action"); forward.setData(RWT.CUSTOM_VARIANT, CustomVariant.LIST_NAVIGATION.key);
forward.setLayoutData(rowData);
forward.setAlignment(SWT.CENTER);
if (visible) { if (visible) {
forward.addListener(SWT.MouseDown, event -> { forward.addListener(SWT.MouseDown, event -> {
this.entityTable.selectPage(pageNumber + 1); this.entityTable.selectPage(pageNumber + 1);
@ -139,6 +137,19 @@ public class TableNavigator {
} else { } else {
forward.setVisible(false); forward.setVisible(false);
} }
final Label end = new Label(parent, SWT.NONE);
end.setText(">>");
end.setData(RWT.CUSTOM_VARIANT, CustomVariant.LIST_NAVIGATION.key);
end.setLayoutData(rowData);
end.setAlignment(SWT.CENTER);
if (visible) {
end.addListener(SWT.MouseDown, event -> {
this.entityTable.selectPage(numberOfPages);
});
} else {
end.setVisible(false);
}
} }
private void createBackwardLabel( private void createBackwardLabel(
@ -146,9 +157,25 @@ public class TableNavigator {
final int pageNumber, final int pageNumber,
final Composite parent) { final Composite parent) {
final GridData rowData = new GridData(22, 16);
final Label start = new Label(parent, SWT.NONE);
start.setText("<<");
start.setLayoutData(rowData);
start.setAlignment(SWT.CENTER);
start.setData(RWT.CUSTOM_VARIANT, CustomVariant.LIST_NAVIGATION.key);
if (visible) {
start.addListener(SWT.MouseDown, event -> {
this.entityTable.selectPage(1);
});
} else {
start.setVisible(false);
}
final Label backward = new Label(parent, SWT.NONE); final Label backward = new Label(parent, SWT.NONE);
backward.setText("<"); backward.setText("<");
backward.setData(RWT.CUSTOM_VARIANT, "action"); backward.setLayoutData(rowData);
backward.setAlignment(SWT.CENTER);
backward.setData(RWT.CUSTOM_VARIANT, CustomVariant.LIST_NAVIGATION.key);
if (visible) { if (visible) {
backward.addListener(SWT.MouseDown, event -> { backward.addListener(SWT.MouseDown, event -> {
this.entityTable.selectPage(pageNumber - 1); this.entityTable.selectPage(pageNumber - 1);
@ -156,6 +183,7 @@ public class TableNavigator {
} else { } else {
backward.setVisible(false); backward.setVisible(false);
} }
} }
} }

6
src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java
View file

@ -155,7 +155,9 @@ public class WidgetFactory {
LIGHT_COLOR_LABEL("colorlight"), LIGHT_COLOR_LABEL("colorlight"),
LOGIN("login"), LOGIN("login"),
LOGIN_BACK("login-back") LOGIN_BACK("login-back"),
LIST_NAVIGATION("list-nav")
; ;
@ -188,7 +190,7 @@ public class WidgetFactory {
final GridLayout contentLayout = new GridLayout(); final GridLayout contentLayout = new GridLayout();
contentLayout.marginLeft = 10; contentLayout.marginLeft = 10;
content.setLayout(contentLayout); content.setLayout(contentLayout);
final GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true); final GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
content.setLayoutData(gridData); content.setLayoutData(gridData);
return content; return content;
} }

1
src/main/java/ch/ethz/seb/sebserver/webservice/AdminUserInitializer.java
View file

@ -121,6 +121,7 @@ class AdminUserInitializer {
institutionId, institutionId,
this.adminName, this.adminName,
this.adminName, this.adminName,
this.adminName,
generateAdminPassword, generateAdminPassword,
generateAdminPassword, generateAdminPassword,
null, null,

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

@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class AdditionalAttributeRecordDynamicSqlSupport { public final class AdditionalAttributeRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source Table: additional_attributes")
public static final AdditionalAttributeRecord additionalAttributeRecord = new AdditionalAttributeRecord(); public static final AdditionalAttributeRecord additionalAttributeRecord = new AdditionalAttributeRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.id")
public static final SqlColumn<Long> id = additionalAttributeRecord.id; public static final SqlColumn<Long> id = additionalAttributeRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.entity_type")
public static final SqlColumn<String> entityType = additionalAttributeRecord.entityType; public static final SqlColumn<String> entityType = additionalAttributeRecord.entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.entity_id")
public static final SqlColumn<Long> entityId = additionalAttributeRecord.entityId; public static final SqlColumn<Long> entityId = additionalAttributeRecord.entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.name")
public static final SqlColumn<String> name = additionalAttributeRecord.name; public static final SqlColumn<String> name = additionalAttributeRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source field: additional_attributes.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.value")
public static final SqlColumn<String> value = additionalAttributeRecord.value; public static final SqlColumn<String> value = additionalAttributeRecord.value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source Table: additional_attributes")
public static final class AdditionalAttributeRecord extends SqlTable { public static final class AdditionalAttributeRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

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

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

@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ClientConnectionRecordDynamicSqlSupport { public final class ClientConnectionRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+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="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+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="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source field: client_connection.institution_id")
public static final SqlColumn<Long> institutionId = clientConnectionRecord.institutionId; public static final SqlColumn<Long> institutionId = clientConnectionRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.exam_user_session_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source field: client_connection.exam_user_session_id")
public static final SqlColumn<String> examUserSessionId = clientConnectionRecord.examUserSessionId; public static final SqlColumn<String> examUserSessionId = clientConnectionRecord.examUserSessionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source field: client_connection.creation_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source field: client_connection.creation_time")
public static final SqlColumn<Long> creationTime = clientConnectionRecord.creationTime; public static final SqlColumn<Long> creationTime = clientConnectionRecord.creationTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source Table: client_connection")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -60,7 +60,7 @@ public interface ClientConnectionRecordMapper {
}) })
ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); ClientConnectionRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source Table: client_connection")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -75,22 +75,22 @@ public interface ClientConnectionRecordMapper {
}) })
List<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement); List<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source Table: client_connection")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord) return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -98,7 +98,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source Table: client_connection")
default int insert(ClientConnectionRecord record) { default int insert(ClientConnectionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientConnectionRecord) .into(clientConnectionRecord)
@ -114,7 +114,7 @@ public interface ClientConnectionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
default int insertSelective(ClientConnectionRecord record) { default int insertSelective(ClientConnectionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientConnectionRecord) .into(clientConnectionRecord)
@ -130,19 +130,19 @@ public interface ClientConnectionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime)
.from(clientConnectionRecord); .from(clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime)
.from(clientConnectionRecord); .from(clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
default ClientConnectionRecord selectByPrimaryKey(Long id_) { default ClientConnectionRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime)
.from(clientConnectionRecord) .from(clientConnectionRecord)
@ -151,7 +151,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientConnectionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -164,7 +164,7 @@ public interface ClientConnectionRecordMapper {
.set(creationTime).equalTo(record::getCreationTime); .set(creationTime).equalTo(record::getCreationTime);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientConnectionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -177,7 +177,7 @@ public interface ClientConnectionRecordMapper {
.set(creationTime).equalToWhenPresent(record::getCreationTime); .set(creationTime).equalToWhenPresent(record::getCreationTime);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
default int updateByPrimaryKey(ClientConnectionRecord record) { default int updateByPrimaryKey(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -193,7 +193,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
default int updateByPrimaryKeySelective(ClientConnectionRecord record) { default int updateByPrimaryKeySelective(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -7,31 +7,31 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ClientEventRecordDynamicSqlSupport { public final class ClientEventRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.client_connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source field: client_event.client_connection_id")
public static final SqlColumn<Long> clientConnectionId = clientEventRecord.clientConnectionId; public static final SqlColumn<Long> clientConnectionId = clientEventRecord.clientConnectionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.client_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source field: client_event.client_time")
public static final SqlColumn<Long> clientTime = clientEventRecord.clientTime; public static final SqlColumn<Long> clientTime = clientEventRecord.clientTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.server_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source field: client_event.server_time")
public static final SqlColumn<Long> serverTime = clientEventRecord.serverTime; public static final SqlColumn<Long> serverTime = clientEventRecord.serverTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source Table: client_event")
public static final class ClientEventRecord extends SqlTable { public static final class ClientEventRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,19 +32,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ClientEventRecordMapper { public interface ClientEventRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source Table: client_event")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
int insert(InsertStatementProvider<ClientEventRecord> insertStatement); int insert(InsertStatementProvider<ClientEventRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source Table: client_event")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -57,7 +57,7 @@ public interface ClientEventRecordMapper {
}) })
ClientEventRecord selectOne(SelectStatementProvider selectStatement); ClientEventRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -70,22 +70,22 @@ public interface ClientEventRecordMapper {
}) })
List<ClientEventRecord> selectMany(SelectStatementProvider selectStatement); List<ClientEventRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord) return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -93,7 +93,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
default int insert(ClientEventRecord record) { default int insert(ClientEventRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientEventRecord) .into(clientEventRecord)
@ -108,7 +108,7 @@ public interface ClientEventRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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, clientConnectionId, type, clientTime, serverTime, numericValue, text) return SelectDSL.selectWithMapper(this::selectMany, id, clientConnectionId, type, clientTime, serverTime, numericValue, text)
.from(clientEventRecord); .from(clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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, clientConnectionId, type, clientTime, serverTime, numericValue, text) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, clientConnectionId, type, clientTime, serverTime, numericValue, text)
.from(clientEventRecord); .from(clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
default ClientEventRecord selectByPrimaryKey(Long id_) { default ClientEventRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, clientConnectionId, type, clientTime, serverTime, numericValue, text) return SelectDSL.selectWithMapper(this::selectOne, id, clientConnectionId, type, clientTime, serverTime, numericValue, text)
.from(clientEventRecord) .from(clientEventRecord)
@ -144,7 +144,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientEventRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(id).equalTo(record::getId) .set(id).equalTo(record::getId)
@ -156,7 +156,7 @@ public interface ClientEventRecordMapper {
.set(text).equalTo(record::getText); .set(text).equalTo(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientEventRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(id).equalToWhenPresent(record::getId) .set(id).equalToWhenPresent(record::getId)
@ -168,7 +168,7 @@ public interface ClientEventRecordMapper {
.set(text).equalToWhenPresent(record::getText); .set(text).equalToWhenPresent(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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(clientConnectionId).equalTo(record::getClientConnectionId) .set(clientConnectionId).equalTo(record::getClientConnectionId)
@ -182,7 +182,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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(clientConnectionId).equalToWhenPresent(record::getClientConnectionId) .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId)

14
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.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 ClientInstructionRecordDynamicSqlSupport { public final class ClientInstructionRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source Table: client_instruction")
public static final ClientInstructionRecord clientInstructionRecord = new ClientInstructionRecord(); public static final ClientInstructionRecord clientInstructionRecord = new ClientInstructionRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.id")
public static final SqlColumn<Long> id = clientInstructionRecord.id; public static final SqlColumn<Long> id = clientInstructionRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.exam_id")
public static final SqlColumn<Long> examId = clientInstructionRecord.examId; public static final SqlColumn<Long> examId = clientInstructionRecord.examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source field: client_instruction.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.connection_token")
public static final SqlColumn<String> connectionToken = clientInstructionRecord.connectionToken; public static final SqlColumn<String> connectionToken = clientInstructionRecord.connectionToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source field: client_instruction.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.type")
public static final SqlColumn<String> type = clientInstructionRecord.type; public static final SqlColumn<String> type = clientInstructionRecord.type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source field: client_instruction.attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source field: client_instruction.attributes")
public static final SqlColumn<String> attributes = clientInstructionRecord.attributes; public static final SqlColumn<String> attributes = clientInstructionRecord.attributes;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source Table: client_instruction")
public static final class ClientInstructionRecord extends SqlTable { public static final class ClientInstructionRecord 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/ClientInstructionRecordMapper.java
View file

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ClientInstructionRecordMapper { public interface ClientInstructionRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
@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="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
@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="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
@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<ClientInstructionRecord> insertStatement); int insert(InsertStatementProvider<ClientInstructionRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
@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 ClientInstructionRecordMapper {
}) })
ClientInstructionRecord selectOne(SelectStatementProvider selectStatement); ClientInstructionRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
@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 ClientInstructionRecordMapper {
}) })
List<ClientInstructionRecord> selectMany(SelectStatementProvider selectStatement); List<ClientInstructionRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
@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="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
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(clientInstructionRecord); .from(clientInstructionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() { default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord); return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord) return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -90,7 +90,7 @@ public interface ClientInstructionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
default int insert(ClientInstructionRecord record) { default int insert(ClientInstructionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientInstructionRecord) .into(clientInstructionRecord)
@ -102,7 +102,7 @@ public interface ClientInstructionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
default int insertSelective(ClientInstructionRecord record) { default int insertSelective(ClientInstructionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientInstructionRecord) .into(clientInstructionRecord)
@ -114,19 +114,19 @@ public interface ClientInstructionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientInstructionRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientInstructionRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, examId, connectionToken, type, attributes) return SelectDSL.selectWithMapper(this::selectMany, id, examId, connectionToken, type, attributes)
.from(clientInstructionRecord); .from(clientInstructionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientInstructionRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientInstructionRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, connectionToken, type, attributes) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, connectionToken, type, attributes)
.from(clientInstructionRecord); .from(clientInstructionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
default ClientInstructionRecord selectByPrimaryKey(Long id_) { default ClientInstructionRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, examId, connectionToken, type, attributes) return SelectDSL.selectWithMapper(this::selectOne, id, examId, connectionToken, type, attributes)
.from(clientInstructionRecord) .from(clientInstructionRecord)
@ -135,7 +135,7 @@ public interface ClientInstructionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.801+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientInstructionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientInstructionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -144,7 +144,7 @@ public interface ClientInstructionRecordMapper {
.set(attributes).equalTo(record::getAttributes); .set(attributes).equalTo(record::getAttributes);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.801+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientInstructionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientInstructionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)
@ -153,7 +153,7 @@ public interface ClientInstructionRecordMapper {
.set(attributes).equalToWhenPresent(record::getAttributes); .set(attributes).equalToWhenPresent(record::getAttributes);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.801+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source Table: client_instruction")
default int updateByPrimaryKey(ClientInstructionRecord record) { default int updateByPrimaryKey(ClientInstructionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -165,7 +165,7 @@ public interface ClientInstructionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.801+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source Table: client_instruction")
default int updateByPrimaryKeySelective(ClientInstructionRecord record) { default int updateByPrimaryKeySelective(ClientInstructionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord) return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)

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="2020-01-09T10:29:16.624+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.090+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="2020-01-09T10:29:16.627+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.092+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="2020-01-09T10:29:16.628+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.093+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="2020-01-09T10:29:16.629+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.093+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="2020-01-09T10:29:16.629+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.093+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="2020-01-09T10:29:16.629+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.094+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="2020-01-09T10:29:16.630+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.094+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="2020-01-09T10:29:16.630+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.094+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="2020-01-09T10:29:16.630+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.094+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="2020-01-09T10:29:16.627+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.092+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="2020-01-09T10:29:16.632+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.095+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="2020-01-09T10:29:16.633+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.097+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="2020-01-09T10:29:16.634+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.101+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="2020-01-09T10:29:16.637+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.103+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="2020-01-09T10:29:16.639+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.104+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="2020-01-09T10:29:16.640+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.105+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="2020-01-09T10:29:16.640+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.105+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="2020-01-09T10:29:16.641+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.106+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="2020-01-09T10:29:16.641+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.107+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="2020-01-09T10:29:16.642+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.108+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="2020-01-09T10:29:16.643+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.110+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="2020-01-09T10:29:16.644+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.111+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="2020-01-09T10:29:16.645+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.114+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="2020-01-09T10:29:16.645+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.115+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="2020-01-09T10:29:16.646+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.116+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="2020-01-09T10:29:16.647+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.118+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="2020-01-09T10:29:16.648+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.119+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="2020-01-09T10:29:16.649+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.120+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="2020-01-09T10:29:16.767+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+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="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+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="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+01:00", comments="Source field: configuration_node.template_id")
public static final SqlColumn<Long> templateId = configurationNodeRecord.templateId; public static final SqlColumn<Long> templateId = configurationNodeRecord.templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source field: configuration_node.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+01:00", comments="Source field: configuration_node.status")
public static final SqlColumn<String> status = configurationNodeRecord.status; public static final SqlColumn<String> status = configurationNodeRecord.status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+01:00", comments="Source Table: configuration_node")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status)
.from(configurationNodeRecord); .from(configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+01:00", comments="Source Table: configuration_node")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status)
.from(configurationNodeRecord); .from(configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+01:00", comments="Source Table: configuration_node")
default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { default ConfigurationNodeRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, templateId, owner, name, description, type, status) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, templateId, owner, name, description, type, status)
.from(configurationNodeRecord) .from(configurationNodeRecord)
@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+01:00", comments="Source Table: configuration_node")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationNodeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -159,7 +159,7 @@ public interface ConfigurationNodeRecordMapper {
.set(status).equalTo(record::getStatus); .set(status).equalTo(record::getStatus);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+01:00", comments="Source Table: configuration_node")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationNodeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -171,7 +171,7 @@ public interface ConfigurationNodeRecordMapper {
.set(status).equalToWhenPresent(record::getStatus); .set(status).equalToWhenPresent(record::getStatus);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.261+01:00", comments="Source Table: configuration_node")
default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) { default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -7,28 +7,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationRecordDynamicSqlSupport { public final class ConfigurationRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+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="2020-01-09T10:29:16.763+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+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="2020-01-09T10:29:16.763+01:00", comments="Source field: configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.institution_id")
public static final SqlColumn<Long> institutionId = configurationRecord.institutionId; public static final SqlColumn<Long> institutionId = configurationRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.763+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.763+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.764+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.764+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.761+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+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="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -59,7 +59,7 @@ public interface ConfigurationRecordMapper {
}) })
ConfigurationRecord selectOne(SelectStatementProvider selectStatement); ConfigurationRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -71,22 +71,22 @@ public interface ConfigurationRecordMapper {
}) })
List<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -94,7 +94,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
default int insert(ConfigurationRecord record) { default int insert(ConfigurationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationRecord) .into(configurationRecord)
@ -107,7 +107,7 @@ public interface ConfigurationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
default int insertSelective(ConfigurationRecord record) { default int insertSelective(ConfigurationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationRecord) .into(configurationRecord)
@ -120,19 +120,19 @@ public interface ConfigurationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup)
.from(configurationRecord); .from(configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup)
.from(configurationRecord); .from(configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration")
default ConfigurationRecord selectByPrimaryKey(Long id_) { default ConfigurationRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationNodeId, version, versionDate, followup) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationNodeId, version, versionDate, followup)
.from(configurationRecord) .from(configurationRecord)
@ -141,7 +141,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -151,7 +151,7 @@ public interface ConfigurationRecordMapper {
.set(followup).equalTo(record::getFollowup); .set(followup).equalTo(record::getFollowup);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -161,7 +161,7 @@ public interface ConfigurationRecordMapper {
.set(followup).equalToWhenPresent(record::getFollowup); .set(followup).equalToWhenPresent(record::getFollowup);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration")
default int updateByPrimaryKey(ConfigurationRecord record) { default int updateByPrimaryKey(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -174,7 +174,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration")
default int updateByPrimaryKeySelective(ConfigurationRecord record) { default int updateByPrimaryKeySelective(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationValueRecordDynamicSqlSupport { public final class ConfigurationValueRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+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="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+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="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+01:00", comments="Source field: configuration_value.institution_id")
public static final SqlColumn<Long> institutionId = configurationValueRecord.institutionId; public static final SqlColumn<Long> institutionId = configurationValueRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+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="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+01:00", comments="Source Table: configuration_value")
public static final class ConfigurationValueRecord extends SqlTable { public static final class ConfigurationValueRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -31,19 +31,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ConfigurationValueRecordMapper { public interface ConfigurationValueRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+01:00", comments="Source Table: configuration_value")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
int insert(InsertStatementProvider<ConfigurationValueRecord> insertStatement); int insert(InsertStatementProvider<ConfigurationValueRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+01:00", comments="Source Table: configuration_value")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -55,7 +55,7 @@ public interface ConfigurationValueRecordMapper {
}) })
ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement); ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+01:00", comments="Source Table: configuration_value")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -67,22 +67,22 @@ public interface ConfigurationValueRecordMapper {
}) })
List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+01:00", comments="Source Table: configuration_value")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -90,7 +90,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
default int insert(ConfigurationValueRecord record) { default int insert(ConfigurationValueRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationValueRecord) .into(configurationValueRecord)
@ -104,7 +104,7 @@ public interface ConfigurationValueRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+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="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value)
.from(configurationValueRecord); .from(configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value)
.from(configurationValueRecord); .from(configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
default ConfigurationValueRecord selectByPrimaryKey(Long id_) { default ConfigurationValueRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationId, configurationAttributeId, listIndex, value) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationId, configurationAttributeId, listIndex, value)
.from(configurationValueRecord) .from(configurationValueRecord)
@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(id).equalTo(record::getId) .set(id).equalTo(record::getId)
@ -150,7 +150,7 @@ public interface ConfigurationValueRecordMapper {
.set(value).equalTo(record::getValue); .set(value).equalTo(record::getValue);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(id).equalToWhenPresent(record::getId) .set(id).equalToWhenPresent(record::getId)
@ -161,7 +161,7 @@ public interface ConfigurationValueRecordMapper {
.set(value).equalToWhenPresent(record::getValue); .set(value).equalToWhenPresent(record::getValue);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
default int updateByPrimaryKey(ConfigurationValueRecord record) { default int updateByPrimaryKey(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -174,7 +174,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
default int updateByPrimaryKeySelective(ConfigurationValueRecord record) { default int updateByPrimaryKeySelective(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ExamConfigurationMapRecordDynamicSqlSupport { public final class ExamConfigurationMapRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+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="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+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="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+01:00", comments="Source field: exam_configuration_map.institution_id")
public static final SqlColumn<Long> institutionId = examConfigurationMapRecord.institutionId; public static final SqlColumn<Long> institutionId = examConfigurationMapRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
public static final SqlColumn<String> encryptSecret = examConfigurationMapRecord.encryptSecret; public static final SqlColumn<String> encryptSecret = examConfigurationMapRecord.encryptSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+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="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+01:00", comments="Source Table: exam_configuration_map")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -57,7 +57,7 @@ public interface ExamConfigurationMapRecordMapper {
}) })
ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement); ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+01:00", comments="Source Table: exam_configuration_map")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -69,22 +69,22 @@ public interface ExamConfigurationMapRecordMapper {
}) })
List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement); List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+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="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+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="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+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="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord) return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -92,7 +92,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
default int insert(ExamConfigurationMapRecord record) { default int insert(ExamConfigurationMapRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examConfigurationMapRecord) .into(examConfigurationMapRecord)
@ -105,7 +105,7 @@ public interface ExamConfigurationMapRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
default int insertSelective(ExamConfigurationMapRecord record) { default int insertSelective(ExamConfigurationMapRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examConfigurationMapRecord) .into(examConfigurationMapRecord)
@ -118,19 +118,19 @@ public interface ExamConfigurationMapRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret)
.from(examConfigurationMapRecord); .from(examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret)
.from(examConfigurationMapRecord); .from(examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) { default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, userNames, encryptSecret) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, userNames, encryptSecret)
.from(examConfigurationMapRecord) .from(examConfigurationMapRecord)
@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -149,7 +149,7 @@ public interface ExamConfigurationMapRecordMapper {
.set(encryptSecret).equalTo(record::getEncryptSecret); .set(encryptSecret).equalTo(record::getEncryptSecret);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -159,7 +159,7 @@ public interface ExamConfigurationMapRecordMapper {
.set(encryptSecret).equalToWhenPresent(record::getEncryptSecret); .set(encryptSecret).equalToWhenPresent(record::getEncryptSecret);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
default int updateByPrimaryKey(ExamConfigurationMapRecord record) { default int updateByPrimaryKey(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -172,7 +172,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.266+01:00", comments="Source Table: exam_configuration_map")
default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) { default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -6,52 +6,52 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ExamRecordDynamicSqlSupport { public final class ExamRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+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="2020-01-09T10:29:16.782+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+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="2020-01-09T10:29:16.783+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+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="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+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="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.external_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+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="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+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="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+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="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+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="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.quit_password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+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="2020-01-09T10:29:16.785+01:00", comments="Source field: exam.browser_keys") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+01:00", comments="Source field: exam.browser_keys")
public static final SqlColumn<String> browserKeys = examRecord.browserKeys; public static final SqlColumn<String> browserKeys = examRecord.browserKeys;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.785+01:00", comments="Source field: exam.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+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="2020-01-09T10:29:16.786+01:00", comments="Source field: exam.lms_seb_restriction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source field: exam.lms_seb_restriction")
public static final SqlColumn<Integer> lmsSebRestriction = examRecord.lmsSebRestriction; public static final SqlColumn<Integer> lmsSebRestriction = examRecord.lmsSebRestriction;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.786+01:00", comments="Source field: exam.updating") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source field: exam.updating")
public static final SqlColumn<Integer> updating = examRecord.updating; public static final SqlColumn<Integer> updating = examRecord.updating;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.786+01:00", comments="Source field: exam.lastupdate") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source field: exam.lastupdate")
public static final SqlColumn<String> lastupdate = examRecord.lastupdate; public static final SqlColumn<String> lastupdate = examRecord.lastupdate;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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="2020-01-09T10:29:16.782+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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),
@ -65,7 +65,7 @@ public interface ExamRecordMapper {
}) })
ExamRecord selectOne(SelectStatementProvider selectStatement); ExamRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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),
@ -85,22 +85,22 @@ public interface ExamRecordMapper {
}) })
List<ExamRecord> selectMany(SelectStatementProvider selectStatement); List<ExamRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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_))
@ -108,7 +108,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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)
@ -129,7 +129,7 @@ public interface ExamRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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)
@ -150,19 +150,19 @@ public interface ExamRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active)
.from(examRecord); .from(examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active)
.from(examRecord); .from(examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.789+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
default ExamRecord selectByPrimaryKey(Long id_) { default ExamRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active)
.from(examRecord) .from(examRecord)
@ -171,7 +171,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.789+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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)
@ -189,7 +189,7 @@ public interface ExamRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.789+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+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)
@ -207,7 +207,7 @@ public interface ExamRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.789+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+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)
@ -228,7 +228,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.789+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+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="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.805+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.805+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.805+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.805+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source Table: indicator")
default int updateByPrimaryKeySelective(IndicatorRecord record) { default int updateByPrimaryKeySelective(IndicatorRecord record) {
return UpdateDSL.updateWithMapper(this::update, indicatorRecord) return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)

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

@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class InstitutionRecordDynamicSqlSupport { public final class InstitutionRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+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="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.810+01:00", comments="Source field: institution.theme_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source field: institution.theme_name")
public static final SqlColumn<String> themeName = institutionRecord.themeName; public static final SqlColumn<String> themeName = institutionRecord.themeName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.810+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.809+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source Table: institution")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -57,7 +57,7 @@ public interface InstitutionRecordMapper {
}) })
InstitutionRecord selectOne(SelectStatementProvider selectStatement); InstitutionRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source Table: institution")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -69,22 +69,22 @@ public interface InstitutionRecordMapper {
}) })
List<InstitutionRecord> selectMany(SelectStatementProvider selectStatement); List<InstitutionRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -92,7 +92,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
default int insert(InstitutionRecord record) { default int insert(InstitutionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(institutionRecord) .into(institutionRecord)
@ -105,7 +105,7 @@ public interface InstitutionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
default int insertSelective(InstitutionRecord record) { default int insertSelective(InstitutionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(institutionRecord) .into(institutionRecord)
@ -118,19 +118,19 @@ public interface InstitutionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage)
.from(institutionRecord); .from(institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage)
.from(institutionRecord); .from(institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
default InstitutionRecord selectByPrimaryKey(Long id_) { default InstitutionRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage) return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage)
.from(institutionRecord) .from(institutionRecord)
@ -139,7 +139,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(InstitutionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -149,7 +149,7 @@ public interface InstitutionRecordMapper {
.set(logoImage).equalTo(record::getLogoImage); .set(logoImage).equalTo(record::getLogoImage);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(InstitutionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)
@ -159,7 +159,7 @@ public interface InstitutionRecordMapper {
.set(logoImage).equalToWhenPresent(record::getLogoImage); .set(logoImage).equalToWhenPresent(record::getLogoImage);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
default int updateByPrimaryKey(InstitutionRecord record) { default int updateByPrimaryKey(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -172,7 +172,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+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)

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

@ -6,49 +6,49 @@ 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="2020-01-09T10:29:16.814+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_proxy_host") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.lms_proxy_host")
public static final SqlColumn<String> lmsProxyHost = lmsSetupRecord.lmsProxyHost; public static final SqlColumn<String> lmsProxyHost = lmsSetupRecord.lmsProxyHost;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_proxy_port") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.lms_proxy_port")
public static final SqlColumn<Integer> lmsProxyPort = lmsSetupRecord.lmsProxyPort; public static final SqlColumn<Integer> lmsProxyPort = lmsSetupRecord.lmsProxyPort;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_proxy_auth_username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
public static final SqlColumn<String> lmsProxyAuthUsername = lmsSetupRecord.lmsProxyAuthUsername; public static final SqlColumn<String> lmsProxyAuthUsername = lmsSetupRecord.lmsProxyAuthUsername;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
public static final SqlColumn<String> lmsProxyAuthSecret = lmsSetupRecord.lmsProxyAuthSecret; public static final SqlColumn<String> lmsProxyAuthSecret = lmsSetupRecord.lmsProxyAuthSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.814+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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),
@ -64,7 +64,7 @@ public interface LmsSetupRecordMapper {
}) })
LmsSetupRecord selectOne(SelectStatementProvider selectStatement); LmsSetupRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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),
@ -83,22 +83,22 @@ public interface LmsSetupRecordMapper {
}) })
List<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement); List<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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_))
@ -106,7 +106,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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)
@ -126,7 +126,7 @@ public interface LmsSetupRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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)
@ -146,19 +146,19 @@ public interface LmsSetupRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, active)
.from(lmsSetupRecord); .from(lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, active)
.from(lmsSetupRecord); .from(lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, active)
.from(lmsSetupRecord) .from(lmsSetupRecord)
@ -167,7 +167,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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)
@ -184,7 +184,7 @@ public interface LmsSetupRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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)
@ -201,7 +201,7 @@ public interface LmsSetupRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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)
@ -221,7 +221,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+01:00", comments="Source Table: lms_setup")
default int updateByPrimaryKeySelective(LmsSetupRecord record) { default int updateByPrimaryKeySelective(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class OrientationRecordDynamicSqlSupport { public final class OrientationRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+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="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+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="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+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="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.template_id")
public static final SqlColumn<Long> templateId = orientationRecord.templateId; public static final SqlColumn<Long> templateId = orientationRecord.templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.view_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.view_id")
public static final SqlColumn<Long> viewId = orientationRecord.viewId; public static final SqlColumn<Long> viewId = orientationRecord.viewId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.group_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.group_id")
public static final SqlColumn<String> groupId = orientationRecord.groupId; public static final SqlColumn<String> groupId = orientationRecord.groupId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.757+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.757+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.757+01:00", comments="Source field: orientation.title") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source field: orientation.title")
public static final SqlColumn<String> title = orientationRecord.title; public static final SqlColumn<String> title = orientationRecord.title;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+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="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -61,7 +61,7 @@ public interface OrientationRecordMapper {
}) })
OrientationRecord selectOne(SelectStatementProvider selectStatement); OrientationRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -77,22 +77,22 @@ public interface OrientationRecordMapper {
}) })
List<OrientationRecord> selectMany(SelectStatementProvider selectStatement); List<OrientationRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord) return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -100,7 +100,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
default int insert(OrientationRecord record) { default int insert(OrientationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(orientationRecord) .into(orientationRecord)
@ -117,7 +117,7 @@ public interface OrientationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
default int insertSelective(OrientationRecord record) { default int insertSelective(OrientationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(orientationRecord) .into(orientationRecord)
@ -134,19 +134,19 @@ public interface OrientationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title)
.from(orientationRecord); .from(orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title)
.from(orientationRecord); .from(orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
default OrientationRecord selectByPrimaryKey(Long id_) { default OrientationRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title) return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title)
.from(orientationRecord) .from(orientationRecord)
@ -155,7 +155,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalTo(record::getConfigAttributeId) .set(configAttributeId).equalTo(record::getConfigAttributeId)
@ -169,7 +169,7 @@ public interface OrientationRecordMapper {
.set(title).equalTo(record::getTitle); .set(title).equalTo(record::getTitle);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)
@ -183,7 +183,7 @@ public interface OrientationRecordMapper {
.set(title).equalToWhenPresent(record::getTitle); .set(title).equalToWhenPresent(record::getTitle);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
default int updateByPrimaryKey(OrientationRecord record) { default int updateByPrimaryKey(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalTo(record::getConfigAttributeId) .set(configAttributeId).equalTo(record::getConfigAttributeId)
@ -200,7 +200,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+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="2020-01-09T10:29:16.819+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source Table: user_role")
default int updateByPrimaryKeySelective(RoleRecord record) { default int updateByPrimaryKeySelective(RoleRecord record) {
return UpdateDSL.updateWithMapper(this::update, roleRecord) return UpdateDSL.updateWithMapper(this::update, roleRecord)
.set(userId).equalToWhenPresent(record::getUserId) .set(userId).equalToWhenPresent(record::getUserId)

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

@ -7,34 +7,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class SebClientConfigRecordDynamicSqlSupport { public final class SebClientConfigRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source Table: seb_client_configuration")
public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord(); public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.id")
public static final SqlColumn<Long> id = sebClientConfigRecord.id; public static final SqlColumn<Long> id = sebClientConfigRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.institution_id")
public static final SqlColumn<Long> institutionId = sebClientConfigRecord.institutionId; public static final SqlColumn<Long> institutionId = sebClientConfigRecord.institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.name")
public static final SqlColumn<String> name = sebClientConfigRecord.name; public static final SqlColumn<String> name = sebClientConfigRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.date")
public static final SqlColumn<DateTime> date = sebClientConfigRecord.date; public static final SqlColumn<DateTime> date = sebClientConfigRecord.date;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.client_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source field: seb_client_configuration.client_name")
public static final SqlColumn<String> clientName = sebClientConfigRecord.clientName; public static final SqlColumn<String> clientName = sebClientConfigRecord.clientName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.client_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source field: seb_client_configuration.client_secret")
public static final SqlColumn<String> clientSecret = sebClientConfigRecord.clientSecret; public static final SqlColumn<String> clientSecret = sebClientConfigRecord.clientSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
public static final SqlColumn<String> encryptSecret = sebClientConfigRecord.encryptSecret; public static final SqlColumn<String> encryptSecret = sebClientConfigRecord.encryptSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source field: seb_client_configuration.active")
public static final SqlColumn<Integer> active = sebClientConfigRecord.active; public static final SqlColumn<Integer> active = sebClientConfigRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source Table: seb_client_configuration")
public static final class SebClientConfigRecord extends SqlTable { public static final class SebClientConfigRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

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

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

@ -7,22 +7,22 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ThresholdRecordDynamicSqlSupport { public final class ThresholdRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.indicator_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.822+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.822+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.822+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.822+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.822+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.822+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.822+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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)

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

@ -6,40 +6,43 @@ 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="2020-01-09T10:29:16.817+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+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="2020-01-09T10:29:16.817+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+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="2020-01-09T10:29:16.817+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+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="2020-01-09T10:29:16.817+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+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="2020-01-09T10:29:16.817+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+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="2020-01-09T10:29:16.818+01:00", comments="Source field: user.username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.surname")
public static final SqlColumn<String> surname = userRecord.surname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+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="2020-01-09T10:29:16.818+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+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="2020-01-09T10:29:16.818+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source field: user.language") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source field: user.language")
public static final SqlColumn<String> language = userRecord.language; public static final SqlColumn<String> language = userRecord.language;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.817+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+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);
@ -49,6 +52,8 @@ public final class UserRecordDynamicSqlSupport {
public final SqlColumn<String> name = column("name", JDBCType.VARCHAR); public final SqlColumn<String> name = column("name", JDBCType.VARCHAR);
public final SqlColumn<String> surname = column("surname", JDBCType.VARCHAR);
public final SqlColumn<String> username = column("username", JDBCType.VARCHAR); public final SqlColumn<String> username = column("username", JDBCType.VARCHAR);
public final SqlColumn<String> password = column("password", JDBCType.VARCHAR); public final SqlColumn<String> password = column("password", JDBCType.VARCHAR);

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

@ -32,26 +32,27 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface UserRecordMapper { public interface UserRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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),
@Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), @Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT),
@Arg(column="uuid", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="uuid", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="surname", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@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),
@ -61,13 +62,14 @@ public interface UserRecordMapper {
}) })
UserRecord selectOne(SelectStatementProvider selectStatement); UserRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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),
@Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT), @Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT),
@Arg(column="uuid", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="uuid", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="surname", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@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),
@ -77,22 +79,22 @@ public interface UserRecordMapper {
}) })
List<UserRecord> selectMany(SelectStatementProvider selectStatement); List<UserRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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,13 +102,14 @@ public interface UserRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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)
.map(institutionId).toProperty("institutionId") .map(institutionId).toProperty("institutionId")
.map(uuid).toProperty("uuid") .map(uuid).toProperty("uuid")
.map(name).toProperty("name") .map(name).toProperty("name")
.map(surname).toProperty("surname")
.map(username).toProperty("username") .map(username).toProperty("username")
.map(password).toProperty("password") .map(password).toProperty("password")
.map(email).toProperty("email") .map(email).toProperty("email")
@ -117,13 +120,14 @@ public interface UserRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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)
.map(institutionId).toPropertyWhenPresent("institutionId", record::getInstitutionId) .map(institutionId).toPropertyWhenPresent("institutionId", record::getInstitutionId)
.map(uuid).toPropertyWhenPresent("uuid", record::getUuid) .map(uuid).toPropertyWhenPresent("uuid", record::getUuid)
.map(name).toPropertyWhenPresent("name", record::getName) .map(name).toPropertyWhenPresent("name", record::getName)
.map(surname).toPropertyWhenPresent("surname", record::getSurname)
.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)
@ -134,33 +138,34 @@ public interface UserRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source Table: user")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, surname, username, password, email, language, timezone, active)
.from(userRecord); .from(userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source Table: user")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, surname, username, password, email, language, timezone, active)
.from(userRecord); .from(userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source Table: user")
default UserRecord selectByPrimaryKey(Long id_) { default UserRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, username, password, email, language, timezone, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, surname, 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="2020-01-09T10:29:16.819+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+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)
.set(uuid).equalTo(record::getUuid) .set(uuid).equalTo(record::getUuid)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
.set(surname).equalTo(record::getSurname)
.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)
@ -169,12 +174,13 @@ public interface UserRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+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)
.set(uuid).equalToWhenPresent(record::getUuid) .set(uuid).equalToWhenPresent(record::getUuid)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)
.set(surname).equalToWhenPresent(record::getSurname)
.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)
@ -183,12 +189,13 @@ public interface UserRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+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)
.set(uuid).equalTo(record::getUuid) .set(uuid).equalTo(record::getUuid)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
.set(surname).equalTo(record::getSurname)
.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)
@ -200,12 +207,13 @@ public interface UserRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+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)
.set(uuid).equalToWhenPresent(record::getUuid) .set(uuid).equalToWhenPresent(record::getUuid)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)
.set(surname).equalToWhenPresent(record::getSurname)
.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)

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

@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ViewRecordDynamicSqlSupport { public final class ViewRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source Table: view")
public static final ViewRecord viewRecord = new ViewRecord(); public static final ViewRecord viewRecord = new ViewRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source field: view.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source field: view.id")
public static final SqlColumn<Long> id = viewRecord.id; public static final SqlColumn<Long> id = viewRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source field: view.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source field: view.name")
public static final SqlColumn<String> name = viewRecord.name; public static final SqlColumn<String> name = viewRecord.name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source field: view.columns") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source field: view.columns")
public static final SqlColumn<Integer> columns = viewRecord.columns; public static final SqlColumn<Integer> columns = viewRecord.columns;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source field: view.position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source field: view.position")
public static final SqlColumn<Integer> position = viewRecord.position; public static final SqlColumn<Integer> position = viewRecord.position;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source field: view.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source field: view.template_id")
public static final SqlColumn<Long> templateId = viewRecord.templateId; public static final SqlColumn<Long> templateId = viewRecord.templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source Table: view")
public static final class ViewRecord extends SqlTable { public static final class ViewRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

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

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

@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class WebserviceServerInfoRecordDynamicSqlSupport { public final class WebserviceServerInfoRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
public static final WebserviceServerInfoRecord webserviceServerInfoRecord = new WebserviceServerInfoRecord(); public static final WebserviceServerInfoRecord webserviceServerInfoRecord = new WebserviceServerInfoRecord();
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.id")
public static final SqlColumn<Long> id = webserviceServerInfoRecord.id; public static final SqlColumn<Long> id = webserviceServerInfoRecord.id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source field: webservice_server_info.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.uuid")
public static final SqlColumn<String> uuid = webserviceServerInfoRecord.uuid; public static final SqlColumn<String> uuid = webserviceServerInfoRecord.uuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source field: webservice_server_info.service_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.service_address")
public static final SqlColumn<String> serviceAddress = webserviceServerInfoRecord.serviceAddress; public static final SqlColumn<String> serviceAddress = webserviceServerInfoRecord.serviceAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
public static final class WebserviceServerInfoRecord extends SqlTable { public static final class WebserviceServerInfoRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

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

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

@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class AdditionalAttributeRecord { public class AdditionalAttributeRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+01:00", comments="Source field: additional_attributes.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+01:00", comments="Source field: additional_attributes.entity_type")
private String entityType; private String entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.entity_id")
private Long entityId; private Long entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.value")
private String value; private String value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source Table: additional_attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+01:00", comments="Source Table: additional_attributes")
public AdditionalAttributeRecord(Long id, String entityType, Long entityId, String name, String value) { public AdditionalAttributeRecord(Long id, String entityType, Long entityId, String name, String value) {
this.id = id; this.id = id;
this.entityType = entityType; this.entityType = entityType;
@ -27,27 +27,27 @@ public class AdditionalAttributeRecord {
this.value = value; this.value = value;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+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="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+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="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.value")
public String getValue() { public String getValue() {
return value; return value;
} }
@ -56,7 +56,7 @@ public class AdditionalAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table additional_attributes * This method corresponds to the database table additional_attributes
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class AdditionalAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table additional_attributes * This method corresponds to the database table additional_attributes
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class AdditionalAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table additional_attributes * This method corresponds to the database table additional_attributes
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ClientConnectionRecord { public class ClientConnectionRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.791+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source field: client_connection.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source field: client_connection.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.status")
private String status; private String status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.connection_token")
private String connectionToken; private String connectionToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.exam_user_session_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.exam_user_session_id")
private String examUserSessionId; private String examUserSessionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.client_address")
private String clientAddress; private String clientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.virtual_client_address")
private String virtualClientAddress; private String virtualClientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.creation_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.creation_time")
private Long creationTime; private Long creationTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.790+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source Table: client_connection")
public ClientConnectionRecord(Long id, Long institutionId, Long examId, String status, String connectionToken, String examUserSessionId, String clientAddress, String virtualClientAddress, Long creationTime) { public ClientConnectionRecord(Long id, Long institutionId, Long examId, String status, String connectionToken, String examUserSessionId, String clientAddress, String virtualClientAddress, Long creationTime) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -43,47 +43,47 @@ public class ClientConnectionRecord {
this.creationTime = creationTime; this.creationTime = creationTime;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+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="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source field: client_connection.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+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="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+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="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+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="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.exam_user_session_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.exam_user_session_id")
public String getExamUserSessionId() { public String getExamUserSessionId() {
return examUserSessionId; return examUserSessionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+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="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.virtual_client_address")
public String getVirtualClientAddress() { public String getVirtualClientAddress() {
return virtualClientAddress; return virtualClientAddress;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.creation_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.creation_time")
public Long getCreationTime() { public Long getCreationTime() {
return creationTime; return creationTime;
} }
@ -92,7 +92,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -117,7 +117,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -146,7 +146,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -4,28 +4,28 @@ import java.math.BigDecimal;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ClientEventRecord { public class ClientEventRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source field: client_event.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_connection_id")
private Long clientConnectionId; private Long clientConnectionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.type")
private Integer type; private Integer type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_time")
private Long clientTime; private Long clientTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.server_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.server_time")
private Long serverTime; private Long serverTime;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.numeric_value")
private BigDecimal numericValue; private BigDecimal numericValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.text")
private String text; private String text;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_event")
public ClientEventRecord(Long id, Long clientConnectionId, Integer type, Long clientTime, Long serverTime, BigDecimal numericValue, String text) { public ClientEventRecord(Long id, Long clientConnectionId, Integer type, Long clientTime, Long serverTime, BigDecimal numericValue, String text) {
this.id = id; this.id = id;
this.clientConnectionId = clientConnectionId; this.clientConnectionId = clientConnectionId;
@ -36,77 +36,77 @@ public class ClientEventRecord {
this.text = text; this.text = text;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_event")
public ClientEventRecord() { public ClientEventRecord() {
super(); super();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+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="2020-01-09T10:29:16.795+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.id")
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_connection_id")
public Long getClientConnectionId() { public Long getClientConnectionId() {
return clientConnectionId; return clientConnectionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_connection_id")
public void setClientConnectionId(Long clientConnectionId) { public void setClientConnectionId(Long clientConnectionId) {
this.clientConnectionId = clientConnectionId; this.clientConnectionId = clientConnectionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+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="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.type")
public void setType(Integer type) { public void setType(Integer type) {
this.type = type; this.type = type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_time")
public Long getClientTime() { public Long getClientTime() {
return clientTime; return clientTime;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_time")
public void setClientTime(Long clientTime) { public void setClientTime(Long clientTime) {
this.clientTime = clientTime; this.clientTime = clientTime;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.server_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.server_time")
public Long getServerTime() { public Long getServerTime() {
return serverTime; return serverTime;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.server_time") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.server_time")
public void setServerTime(Long serverTime) { public void setServerTime(Long serverTime) {
this.serverTime = serverTime; this.serverTime = serverTime;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+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="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.numeric_value")
public void setNumericValue(BigDecimal numericValue) { public void setNumericValue(BigDecimal numericValue) {
this.numericValue = numericValue; this.numericValue = numericValue;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.text")
public String getText() { public String getText() {
return text; return text;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.text")
public void setText(String text) { public void setText(String text) {
this.text = text == null ? null : text.trim(); this.text = text == null ? null : text.trim();
} }
@ -115,7 +115,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -138,7 +138,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -165,7 +165,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

28
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.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 ClientInstructionRecord { public class ClientInstructionRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source field: client_instruction.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.connection_token")
private String connectionToken; private String connectionToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.attributes")
private String attributes; private String attributes;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source Table: client_instruction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_instruction")
public ClientInstructionRecord(Long id, Long examId, String connectionToken, String type, String attributes) { public ClientInstructionRecord(Long id, Long examId, String connectionToken, String type, String attributes) {
this.id = id; this.id = id;
this.examId = examId; this.examId = examId;
@ -27,27 +27,27 @@ public class ClientInstructionRecord {
this.attributes = attributes; this.attributes = attributes;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.exam_id")
public Long getExamId() { public Long getExamId() {
return examId; return examId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.connection_token")
public String getConnectionToken() { public String getConnectionToken() {
return connectionToken; return connectionToken;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.type")
public String getType() { public String getType() {
return type; return type;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.attributes") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.attributes")
public String getAttributes() { public String getAttributes() {
return attributes; return attributes;
} }
@ -56,7 +56,7 @@ public class ClientInstructionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_instruction * This method corresponds to the database table client_instruction
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class ClientInstructionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_instruction * This method corresponds to the database table client_instruction
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class ClientInstructionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_instruction * This method corresponds to the database table client_instruction
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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="2020-01-09T10:29:16.615+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.080+01:00", comments="Source field: configuration_attribute.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.parent_id")
private Long parentId; private Long parentId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.resources")
private String resources; private String resources;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+01:00", comments="Source field: configuration_attribute.validator")
private String validator; private String validator;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+01:00", comments="Source field: configuration_attribute.dependencies")
private String dependencies; private String dependencies;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+01:00", comments="Source field: configuration_attribute.default_value")
private String defaultValue; private String defaultValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.611+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.076+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="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+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="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+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="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+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="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+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="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+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="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+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="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+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="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source field: configuration_node.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source field: configuration_node.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source field: configuration_node.template_id")
private Long templateId; private Long templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.owner")
private String owner; private String owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.description")
private String description; private String description;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.status")
private String status; private String status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration_node")
public ConfigurationNodeRecord(Long id, Long institutionId, Long templateId, String owner, String name, String description, String type, String status) { public ConfigurationNodeRecord(Long id, Long institutionId, Long templateId, String owner, String name, String description, String type, String status) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -39,42 +39,42 @@ public class ConfigurationNodeRecord {
this.status = status; this.status = status;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+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="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+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="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.template_id")
public Long getTemplateId() { public Long getTemplateId() {
return templateId; return templateId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+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="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+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="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+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="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+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="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.status")
public String getStatus() { public String getStatus() {
return status; return status;
} }
@ -83,7 +83,7 @@ public class ConfigurationNodeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_node * This method corresponds to the database table configuration_node
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -4,25 +4,25 @@ import javax.annotation.Generated;
import org.joda.time.DateTime; import org.joda.time.DateTime;
public class ConfigurationRecord { public class ConfigurationRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.759+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source field: configuration.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.configuration_node_id")
private Long configurationNodeId; private Long configurationNodeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.version")
private String version; private String version;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.version_date")
private DateTime versionDate; private DateTime versionDate;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.followup")
private Integer followup; private Integer followup;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.759+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: configuration")
public ConfigurationRecord(Long id, Long institutionId, Long configurationNodeId, String version, DateTime versionDate, Integer followup) { public ConfigurationRecord(Long id, Long institutionId, Long configurationNodeId, String version, DateTime versionDate, Integer followup) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -32,32 +32,32 @@ public class ConfigurationRecord {
this.followup = followup; this.followup = followup;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.759+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+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="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+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="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+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="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+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="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.followup")
public Integer getFollowup() { public Integer getFollowup() {
return followup; return followup;
} }
@ -66,7 +66,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -88,7 +88,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -114,7 +114,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.configuration_id")
private Long configurationId; private Long configurationId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.configuration_attribute_id")
private Long configurationAttributeId; private Long configurationAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.list_index")
private Integer listIndex; private Integer listIndex;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+01:00", comments="Source field: configuration_value.value")
private String value; private String value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source Table: configuration_value")
public ConfigurationValueRecord(Long id, Long institutionId, Long configurationId, Long configurationAttributeId, Integer listIndex, String value) { public ConfigurationValueRecord(Long id, Long institutionId, Long configurationId, Long configurationAttributeId, Integer listIndex, String value) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -31,32 +31,32 @@ public class ConfigurationValueRecord {
this.value = value; this.value = value;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+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="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+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="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+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="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+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="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+01:00", comments="Source field: configuration_value.value")
public String getValue() { public String getValue() {
return value; return value;
} }
@ -65,7 +65,7 @@ public class ConfigurationValueRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_value * This method corresponds to the database table configuration_value
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ExamConfigurationMapRecord { public class ExamConfigurationMapRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.262+01:00", comments="Source field: exam_configuration_map.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.262+01:00", comments="Source field: exam_configuration_map.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+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="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.user_names")
private String userNames; private String userNames;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
private String encryptSecret; private String encryptSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.262+01:00", comments="Source Table: exam_configuration_map")
public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String userNames, String encryptSecret) { public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String userNames, String encryptSecret) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -31,32 +31,32 @@ public class ExamConfigurationMapRecord {
this.encryptSecret = encryptSecret; this.encryptSecret = encryptSecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.262+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="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.262+01:00", comments="Source field: exam_configuration_map.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+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="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+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="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.user_names")
public String getUserNames() { public String getUserNames() {
return userNames; return userNames;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
public String getEncryptSecret() { public String getEncryptSecret() {
return encryptSecret; return encryptSecret;
} }
@ -65,7 +65,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -87,7 +87,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -113,7 +113,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,49 +3,49 @@ 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="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.lms_setup_id")
private Long lmsSetupId; private Long lmsSetupId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.external_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.external_id")
private String externalId; private String externalId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.owner")
private String owner; private String owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.supporter")
private String supporter; private String supporter;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.quit_password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.quit_password")
private String quitPassword; private String quitPassword;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.browser_keys") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.browser_keys")
private String browserKeys; private String browserKeys;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.status")
private String status; private String status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.lms_seb_restriction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.lms_seb_restriction")
private Integer lmsSebRestriction; private Integer lmsSebRestriction;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.updating") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.updating")
private Integer updating; private Integer updating;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.lastupdate") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.lastupdate")
private String lastupdate; private String lastupdate;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.777+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.268+01:00", comments="Source Table: exam")
public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String quitPassword, String browserKeys, String status, Integer lmsSebRestriction, Integer updating, String lastupdate, Integer active) { public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String quitPassword, String browserKeys, String status, Integer lmsSebRestriction, Integer updating, String lastupdate, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -63,72 +63,72 @@ public class ExamRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+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="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+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="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+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="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.external_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+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="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+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="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+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="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+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="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.quit_password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+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="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.browser_keys") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.browser_keys")
public String getBrowserKeys() { public String getBrowserKeys() {
return browserKeys; return browserKeys;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+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="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.lms_seb_restriction") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.lms_seb_restriction")
public Integer getLmsSebRestriction() { public Integer getLmsSebRestriction() {
return lmsSebRestriction; return lmsSebRestriction;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.updating") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.updating")
public Integer getUpdating() { public Integer getUpdating() {
return updating; return updating;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.lastupdate") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.lastupdate")
public String getLastupdate() { public String getLastupdate() {
return lastupdate; return lastupdate;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -137,7 +137,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -167,7 +167,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -201,7 +201,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.color")
private String color; private String color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+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="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+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="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+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="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+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="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+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="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class InstitutionRecord { public class InstitutionRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.url_suffix")
private String urlSuffix; private String urlSuffix;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.theme_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.theme_name")
private String themeName; private String themeName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.logo_image")
private String logoImage; private String logoImage;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.808+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source Table: institution")
public InstitutionRecord(Long id, String name, String urlSuffix, String themeName, Integer active, String logoImage) { public InstitutionRecord(Long id, String name, String urlSuffix, String themeName, Integer active, String logoImage) {
this.id = id; this.id = id;
this.name = name; this.name = name;
@ -31,32 +31,32 @@ public class InstitutionRecord {
this.logoImage = logoImage; this.logoImage = logoImage;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+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="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+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="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+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="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.theme_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.theme_name")
public String getThemeName() { public String getThemeName() {
return themeName; return themeName;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+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="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.logo_image")
public String getLogoImage() { public String getLogoImage() {
return logoImage; return logoImage;
} }
@ -65,7 +65,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -87,7 +87,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -113,7 +113,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,46 +3,46 @@ 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="2020-01-09T10:29:16.813+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_type")
private String lmsType; private String lmsType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_url")
private String lmsUrl; private String lmsUrl;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_clientname")
private String lmsClientname; private String lmsClientname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_clientsecret")
private String lmsClientsecret; private String lmsClientsecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_host") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_host")
private String lmsProxyHost; private String lmsProxyHost;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_port") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_port")
private Integer lmsProxyPort; private Integer lmsProxyPort;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_auth_username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
private String lmsProxyAuthUsername; private String lmsProxyAuthUsername;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
private String lmsProxyAuthSecret; private String lmsProxyAuthSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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 lmsProxyHost, Integer lmsProxyPort, String lmsProxyAuthUsername, String lmsProxyAuthSecret, Integer active) { public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String lmsProxyHost, Integer lmsProxyPort, String lmsProxyAuthUsername, String lmsProxyAuthSecret, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -59,67 +59,67 @@ public class LmsSetupRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_host") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_host")
public String getLmsProxyHost() { public String getLmsProxyHost() {
return lmsProxyHost; return lmsProxyHost;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_port") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_port")
public Integer getLmsProxyPort() { public Integer getLmsProxyPort() {
return lmsProxyPort; return lmsProxyPort;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_auth_username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
public String getLmsProxyAuthUsername() { public String getLmsProxyAuthUsername() {
return lmsProxyAuthUsername; return lmsProxyAuthUsername;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
public String getLmsProxyAuthSecret() { public String getLmsProxyAuthSecret() {
return lmsProxyAuthSecret; return lmsProxyAuthSecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -128,7 +128,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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -157,7 +157,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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -190,7 +190,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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class OrientationRecord { public class OrientationRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.754+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.754+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.config_attribute_id")
private Long configAttributeId; private Long configAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.template_id")
private Long templateId; private Long templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.view_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.view_id")
private Long viewId; private Long viewId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.group_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.group_id")
private String groupId; private String groupId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.x_position")
private Integer xPosition; private Integer xPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.y_position")
private Integer yPosition; private Integer yPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.width")
private Integer width; private Integer width;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.251+01:00", comments="Source field: orientation.height")
private Integer height; private Integer height;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.title") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.title")
private String title; private String title;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.754+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source Table: orientation")
public OrientationRecord(Long id, Long configAttributeId, Long templateId, Long viewId, String groupId, Integer xPosition, Integer yPosition, Integer width, Integer height, String title) { public OrientationRecord(Long id, Long configAttributeId, Long templateId, Long viewId, String groupId, Integer xPosition, Integer yPosition, Integer width, Integer height, String title) {
this.id = id; this.id = id;
this.configAttributeId = configAttributeId; this.configAttributeId = configAttributeId;
@ -47,52 +47,52 @@ public class OrientationRecord {
this.title = title; this.title = title;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.754+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+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="2020-01-09T10:29:16.754+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+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="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.template_id")
public Long getTemplateId() { public Long getTemplateId() {
return templateId; return templateId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.view_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.view_id")
public Long getViewId() { public Long getViewId() {
return viewId; return viewId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.group_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.group_id")
public String getGroupId() { public String getGroupId() {
return groupId; return groupId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+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="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+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="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+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="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.251+01:00", comments="Source field: orientation.height")
public Integer getHeight() { public Integer getHeight() {
return height; return height;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.title") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.title")
public String getTitle() { public String getTitle() {
return title; return title;
} }
@ -101,7 +101,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -127,7 +127,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -157,7 +157,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source field: user_role.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source field: user_role.user_id")
private Long userId; private Long userId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source field: user_role.role_name")
private String roleName; private String roleName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+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="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+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="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+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="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -4,31 +4,31 @@ import javax.annotation.Generated;
import org.joda.time.DateTime; import org.joda.time.DateTime;
public class SebClientConfigRecord { public class SebClientConfigRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source field: seb_client_configuration.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.date")
private DateTime date; private DateTime date;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.client_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.client_name")
private String clientName; private String clientName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.client_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.client_secret")
private String clientSecret; private String clientSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
private String encryptSecret; private String encryptSecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source Table: seb_client_configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: seb_client_configuration")
public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, String encryptSecret, Integer active) { public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, String encryptSecret, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -40,42 +40,42 @@ public class SebClientConfigRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.institution_id")
public Long getInstitutionId() { public Long getInstitutionId() {
return institutionId; return institutionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.date")
public DateTime getDate() { public DateTime getDate() {
return date; return date;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.client_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.client_name")
public String getClientName() { public String getClientName() {
return clientName; return clientName;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.client_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.client_secret")
public String getClientSecret() { public String getClientSecret() {
return clientSecret; return clientSecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.encrypt_secret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
public String getEncryptSecret() { public String getEncryptSecret() {
return encryptSecret; return encryptSecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -84,7 +84,7 @@ public class SebClientConfigRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table seb_client_configuration * This method corresponds to the database table seb_client_configuration
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -108,7 +108,7 @@ public class SebClientConfigRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table seb_client_configuration * This method corresponds to the database table seb_client_configuration
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -136,7 +136,7 @@ public class SebClientConfigRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table seb_client_configuration * This method corresponds to the database table seb_client_configuration
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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="2020-01-09T10:29:16.806+01:00", comments="Source field: threshold.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.indicator_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.indicator_id")
private Long indicatorId; private Long indicatorId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.value")
private BigDecimal value; private BigDecimal value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.color")
private String color; private String color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.806+01:00", comments="Source Table: threshold") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.indicator_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.user_uuid")
private String userUuid; private String userUuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.timestamp")
private Long timestamp; private Long timestamp;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.activity_type")
private String activityType; private String activityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.entity_type")
private String entityType; private String entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.entity_id")
private String entityId; private String entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.message")
private String message; private String message;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,42 +3,46 @@ 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="2020-01-09T10:29:16.816+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.uuid")
private String uuid; private String uuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.surname")
private String surname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.username")
private String username; private String username;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.password")
private String password; private String password;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.email")
private String email; private String email;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.language") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.language")
private String language; private String language;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.timezone")
private String timezone; private String timezone;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source Table: user")
public UserRecord(Long id, Long institutionId, String uuid, String name, String username, String password, String email, String language, String timezone, Integer active) { public UserRecord(Long id, Long institutionId, String uuid, String name, String surname, 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;
this.name = name; this.name = name;
this.surname = surname;
this.username = username; this.username = username;
this.password = password; this.password = password;
this.email = email; this.email = email;
@ -47,52 +51,57 @@ public class UserRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+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="2020-01-09T10:29:16.816+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+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="2020-01-09T10:29:16.816+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+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="2020-01-09T10:29:16.817+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+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="2020-01-09T10:29:16.817+01:00", comments="Source field: user.username") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.surname")
public String getSurname() {
return surname;
}
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+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="2020-01-09T10:29:16.817+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+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="2020-01-09T10:29:16.817+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+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="2020-01-09T10:29:16.817+01:00", comments="Source field: user.language") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.language")
public String getLanguage() { public String getLanguage() {
return language; return language;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+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="2020-01-09T10:29:16.817+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -101,7 +110,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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -113,6 +122,7 @@ public class UserRecord {
sb.append(", institutionId=").append(institutionId); sb.append(", institutionId=").append(institutionId);
sb.append(", uuid=").append(uuid); sb.append(", uuid=").append(uuid);
sb.append(", name=").append(name); sb.append(", name=").append(name);
sb.append(", surname=").append(surname);
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);
@ -127,7 +137,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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -145,6 +155,7 @@ public class UserRecord {
&& (this.getInstitutionId() == null ? other.getInstitutionId() == null : this.getInstitutionId().equals(other.getInstitutionId())) && (this.getInstitutionId() == null ? other.getInstitutionId() == null : this.getInstitutionId().equals(other.getInstitutionId()))
&& (this.getUuid() == null ? other.getUuid() == null : this.getUuid().equals(other.getUuid())) && (this.getUuid() == null ? other.getUuid() == null : this.getUuid().equals(other.getUuid()))
&& (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
&& (this.getSurname() == null ? other.getSurname() == null : this.getSurname().equals(other.getSurname()))
&& (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()))
@ -157,7 +168,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 Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {
@ -167,6 +178,7 @@ public class UserRecord {
result = prime * result + ((getInstitutionId() == null) ? 0 : getInstitutionId().hashCode()); result = prime * result + ((getInstitutionId() == null) ? 0 : getInstitutionId().hashCode());
result = prime * result + ((getUuid() == null) ? 0 : getUuid().hashCode()); result = prime * result + ((getUuid() == null) ? 0 : getUuid().hashCode());
result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
result = prime * result + ((getSurname() == null) ? 0 : getSurname().hashCode());
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());

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

@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ViewRecord { public class ViewRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.columns") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.columns")
private Integer columns; private Integer columns;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.position")
private Integer position; private Integer position;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.template_id")
private Long templateId; private Long templateId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source Table: view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source Table: view")
public ViewRecord(Long id, String name, Integer columns, Integer position, Long templateId) { public ViewRecord(Long id, String name, Integer columns, Integer position, Long templateId) {
this.id = id; this.id = id;
this.name = name; this.name = name;
@ -27,27 +27,27 @@ public class ViewRecord {
this.templateId = templateId; this.templateId = templateId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.name")
public String getName() { public String getName() {
return name; return name;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.columns") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.columns")
public Integer getColumns() { public Integer getColumns() {
return columns; return columns;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.position")
public Integer getPosition() { public Integer getPosition() {
return position; return position;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.template_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.template_id")
public Long getTemplateId() { public Long getTemplateId() {
return templateId; return templateId;
} }
@ -56,7 +56,7 @@ public class ViewRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table view * This method corresponds to the database table view
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class ViewRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table view * This method corresponds to the database table view
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class ViewRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table view * This method corresponds to the database table view
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,33 +3,33 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class WebserviceServerInfoRecord { public class WebserviceServerInfoRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.uuid")
private String uuid; private String uuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.service_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.service_address")
private String serviceAddress; private String serviceAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source Table: webservice_server_info") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
public WebserviceServerInfoRecord(Long id, String uuid, String serviceAddress) { public WebserviceServerInfoRecord(Long id, String uuid, String serviceAddress) {
this.id = id; this.id = id;
this.uuid = uuid; this.uuid = uuid;
this.serviceAddress = serviceAddress; this.serviceAddress = serviceAddress;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.id")
public Long getId() { public Long getId() {
return id; return id;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.uuid")
public String getUuid() { public String getUuid() {
return uuid; return uuid;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.service_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.service_address")
public String getServiceAddress() { public String getServiceAddress() {
return serviceAddress; return serviceAddress;
} }
@ -38,7 +38,7 @@ public class WebserviceServerInfoRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table webservice_server_info * This method corresponds to the database table webservice_server_info
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public String toString() { public String toString() {
@ -57,7 +57,7 @@ public class WebserviceServerInfoRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table webservice_server_info * This method corresponds to the database table webservice_server_info
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -80,7 +80,7 @@ public class WebserviceServerInfoRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table webservice_server_info * This method corresponds to the database table webservice_server_info
* *
* @mbg.generated Thu Jan 09 10:29:16 CET 2020 * @mbg.generated Wed Jan 29 14:47:50 CET 2020
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

6
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/UserService.java
View file

@ -46,12 +46,6 @@ public interface UserService {
* @return an overall anonymous user with no rights */ * @return an overall anonymous user with no rights */
SEBServerUser getAnonymousUser(); SEBServerUser getAnonymousUser();
/** Gets a overall super user with all rights. This can be used for background jobs that are
* not user specific but system specific.
*
* @return an overall super user with all rights */
SEBServerUser getSuperUser();
/** Binds the current users institution identifier as default value to a /** Binds the current users institution identifier as default value to a
* *
* @RequestParam of type API.PARAM_INSTITUTION_ID if needed. See EntityController class for example * @RequestParam of type API.PARAM_INSTITUTION_ID if needed. See EntityController class for example

17
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/UserServiceImpl.java
View file

@ -79,11 +79,6 @@ public class UserServiceImpl implements UserService {
return ANONYMOUS_USER; return ANONYMOUS_USER;
} }
@Override
public SEBServerUser getSuperUser() {
return SUPER_USER;
}
@Override @Override
public void addUsersInstitutionDefaultPropertySupport(final WebDataBinder binder) { public void addUsersInstitutionDefaultPropertySupport(final WebDataBinder binder) {
final PropertyEditorSupport usersInstitutionDefaultEditor = new PropertyEditorSupport() { final PropertyEditorSupport usersInstitutionDefaultEditor = new PropertyEditorSupport() {
@ -122,18 +117,10 @@ public class UserServiceImpl implements UserService {
} }
} }
private static final SEBServerUser SUPER_USER = new SEBServerUser(
-1L,
new UserInfo("SEB_SERVER_SUPER_USER", -1L, "superUser", "superUser", null, false, null, null,
Arrays.asList(UserRole.values())
.stream()
.map(ur -> ur.name())
.collect(Collectors.toSet())),
null);
private static final SEBServerUser ANONYMOUS_USER = new SEBServerUser( private static final SEBServerUser ANONYMOUS_USER = new SEBServerUser(
-1L, -1L,
new UserInfo("SEB_SERVER_ANONYMOUS_USER", -2L, "anonymous", "anonymous", null, false, null, null, new UserInfo("SEB_SERVER_ANONYMOUS_USER", -2L, "anonymous", "anonymous", "anonymous", null, false, null,
null,
Arrays.asList(UserRole.values()) Arrays.asList(UserRole.values())
.stream() .stream()
.map(ur -> ur.name()) .map(ur -> ur.name())

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

@ -208,6 +208,7 @@ public class UserDAOImpl implements UserDAO {
userMod.institutionId, userMod.institutionId,
UUID.randomUUID().toString(), UUID.randomUUID().toString(),
userMod.name, userMod.name,
userMod.surname,
userMod.username, userMod.username,
this.userPasswordEncoder.encode(userMod.getNewPassword()), this.userPasswordEncoder.encode(userMod.getNewPassword()),
userMod.email, userMod.email,
@ -238,6 +239,7 @@ public class UserDAOImpl implements UserDAO {
null, null,
null, null,
null, null,
null,
this.userPasswordEncoder.encode(newPassword), this.userPasswordEncoder.encode(newPassword),
null, null,
null, null,
@ -263,6 +265,7 @@ public class UserDAOImpl implements UserDAO {
null, null,
null, null,
userInfo.name, userInfo.name,
userInfo.surname,
userInfo.username, userInfo.username,
null, null,
(userInfo.email == null) ? "" : userInfo.email, (userInfo.email == null) ? "" : userInfo.email,
@ -285,7 +288,7 @@ public class UserDAOImpl implements UserDAO {
final List<Long> ids = extractListOfPKs(all); final List<Long> ids = extractListOfPKs(all);
final UserRecord userRecord = new UserRecord( final UserRecord userRecord = new UserRecord(
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
BooleanUtils.toIntegerObject(active)); BooleanUtils.toIntegerObject(active));
this.userRecordMapper.updateByExampleSelective(userRecord) this.userRecordMapper.updateByExampleSelective(userRecord)
@ -471,6 +474,7 @@ public class UserDAOImpl implements UserDAO {
record.getUuid(), record.getUuid(),
record.getInstitutionId(), record.getInstitutionId(),
record.getName(), record.getName(),
record.getSurname(),
record.getUsername(), record.getUsername(),
record.getEmail(), record.getEmail(),
BooleanUtils.toBooleanObject(record.getActive()), BooleanUtils.toBooleanObject(record.getActive()),

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