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

fix bugs, code changes and add missing user-account endpoints

Browse source
This commit is contained in:
anhefti 2018-12-20 16:33:00 +01:00
parent 372ea749b5
commit b684654efd
65 changed files with 885 additions and 811 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ import javax.annotation.Generated;
/** Defines the global names of the domain model and domain model fields. /** Defines the global names of the domain model and domain model fields.
* This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within the integrated GUI * This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within the integrated GUI
* This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/ * This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/
@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2018-12-19T13:27:34.810+01:00") @Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2018-12-20T15:08:14.623+01:00")
public interface Domain { public interface Domain {
String ATTR_ID = "id"; String ATTR_ID = "id";
@ -160,7 +160,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_USER_NAME = "userName"; String ATTR_USERNAME = "username";
String ATTR_PASSWORD = "password"; String ATTR_PASSWORD = "password";
String ATTR_EMAIL = "email"; String ATTR_EMAIL = "email";
String ATTR_LOCALE = "locale"; String ATTR_LOCALE = "locale";

8
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/DeletionReport.java → src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityProcessingReport.java
View file

@ -6,15 +6,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
package ch.ethz.seb.sebserver.webservice.servicelayer.dao; package ch.ethz.seb.sebserver.gbl.model;
import ch.ethz.seb.sebserver.gbl.model.Entity; public class EntityProcessingReport {
public class DeletionReport {
// TODO // TODO
public DeletionReport add(final Entity entity) { public EntityProcessingReport add(final Entity entity) {
// TODO // TODO
return this; return this;
} }

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

@ -2,7 +2,7 @@ package ch.ethz.seb.sebserver.gbl.model;
import javax.annotation.Generated; import javax.annotation.Generated;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2018-12-19T13:27:34.869+01:00") @Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2018-12-20T15:08:14.701+01:00")
public enum EntityType { public enum EntityType {
CONFIGURATION_ATTRIBUTE, CONFIGURATION_ATTRIBUTE,
CONFIGURATION_VALUE, CONFIGURATION_VALUE,

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

@ -8,7 +8,6 @@
package ch.ethz.seb.sebserver.gbl.model.user; package ch.ethz.seb.sebserver.gbl.model.user;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@ -24,8 +23,8 @@ public final class UserFilter {
public final Long institutionId; public final Long institutionId;
@JsonProperty(USER.ATTR_NAME) @JsonProperty(USER.ATTR_NAME)
public final String name; public final String name;
@JsonProperty(USER.ATTR_USER_NAME) @JsonProperty(USER.ATTR_USERNAME)
public final String userName; public final String username;
@JsonProperty(USER.ATTR_EMAIL) @JsonProperty(USER.ATTR_EMAIL)
public final String email; public final String email;
@JsonProperty(USER.ATTR_LOCALE) @JsonProperty(USER.ATTR_LOCALE)
@ -34,14 +33,14 @@ public final class UserFilter {
public UserFilter( public UserFilter(
@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_USER_NAME) final String userName, @JsonProperty(USER.ATTR_USERNAME) final String username,
@JsonProperty(USER.ATTR_EMAIL) final String email, @JsonProperty(USER.ATTR_EMAIL) final String email,
@JsonProperty(USER.ATTR_ACTIVE) final Boolean active, @JsonProperty(USER.ATTR_ACTIVE) final Boolean active,
@JsonProperty(USER.ATTR_LOCALE) final String locale) { @JsonProperty(USER.ATTR_LOCALE) final String locale) {
this.institutionId = institutionId; this.institutionId = institutionId;
this.name = name; this.name = name;
this.userName = userName; this.username = username;
this.email = email; this.email = email;
this.active = (active != null) ? active : true; this.active = (active != null) ? active : true;
this.locale = locale; this.locale = locale;
@ -55,8 +54,8 @@ public final class UserFilter {
return this.name; return this.name;
} }
public String getUserName() { public String getUsername() {
return this.userName; return this.username;
} }
public String getEmail() { public String getEmail() {
@ -71,24 +70,9 @@ public final class UserFilter {
return this.locale; return this.locale;
} }
@JsonIgnore
public String getNameLike() {
return (this.name == null) ? null : "%" + this.name + "%";
}
@JsonIgnore
public String getUserNameLike() {
return (this.userName == null) ? null : "%" + this.userName + "%";
}
@JsonIgnore
public String getEmailLike() {
return (this.email == null) ? null : "%" + this.email + "%";
}
@Override @Override
public String toString() { public String toString() {
return "UserFilter [institutionId=" + this.institutionId + ", name=" + this.name + ", userName=" + this.userName return "UserFilter [institutionId=" + this.institutionId + ", name=" + this.name + ", username=" + this.username
+ ", email=" + ", email="
+ this.email + ", active=" + this.active + ", locale=" + this.locale + "]"; + this.email + ", active=" + this.active + ", locale=" + this.locale + "]";
} }

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

@ -49,8 +49,8 @@ public final class UserInfo implements GrantEntity, Activatable, Serializable {
public final String name; public final String name;
/** The internal user name */ /** The internal user name */
@JsonProperty(USER.ATTR_USER_NAME) @JsonProperty(USER.ATTR_USERNAME)
public final String userName; public final String username;
/** E-mail address of the user */ /** E-mail address of the user */
@JsonProperty(USER.ATTR_EMAIL) @JsonProperty(USER.ATTR_EMAIL)
@ -77,7 +77,7 @@ public final class UserInfo implements GrantEntity, 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_USER_NAME) final String userName, @JsonProperty(USER.ATTR_USERNAME) final String username,
@JsonProperty(USER.ATTR_EMAIL) final String email, @JsonProperty(USER.ATTR_EMAIL) final String email,
@JsonProperty(USER.ATTR_ACTIVE) final Boolean active, @JsonProperty(USER.ATTR_ACTIVE) final Boolean active,
@JsonProperty(USER.ATTR_LOCALE) final Locale locale, @JsonProperty(USER.ATTR_LOCALE) final Locale locale,
@ -87,7 +87,7 @@ public final class UserInfo implements GrantEntity, Activatable, Serializable {
this.uuid = uuid; this.uuid = uuid;
this.institutionId = institutionId; this.institutionId = institutionId;
this.name = name; this.name = name;
this.userName = userName; this.username = username;
this.email = email; this.email = email;
this.active = BooleanUtils.isTrue(active); this.active = BooleanUtils.isTrue(active);
this.locale = locale; this.locale = locale;
@ -128,8 +128,8 @@ public final class UserInfo implements GrantEntity, Activatable, Serializable {
return this.name; return this.name;
} }
public String getUserName() { public String getUsername() {
return this.userName; return this.username;
} }
public String getEmail() { public String getEmail() {
@ -191,8 +191,8 @@ public final class UserInfo implements GrantEntity, Activatable, Serializable {
@Override @Override
public String toString() { public String toString() {
return "UserInfo [uuid=" + this.uuid + ", institutionId=" + this.institutionId + ", name=" + this.name return "UserInfo [uuid=" + this.uuid + ", institutionId=" + this.institutionId + ", name=" + this.name
+ ", userName=" + ", username="
+ this.userName + ", email=" + this.email + ", active=" + this.active + ", locale=" + this.locale + this.username + ", email=" + this.email + ", active=" + this.active + ", locale=" + this.locale
+ ", timeZone=" + this.timeZone + ", timeZone=" + this.timeZone
+ ", roles=" + this.roles + "]"; + ", roles=" + this.roles + "]";
} }
@ -206,7 +206,7 @@ public final class UserInfo implements GrantEntity, Activatable, Serializable {
userInfo.getUuid(), userInfo.getUuid(),
userInfo.getInstitutionId(), userInfo.getInstitutionId(),
userInfo.getName(), userInfo.getName(),
userInfo.getUserName(), userInfo.getUsername(),
userInfo.getEmail(), userInfo.getEmail(),
userInfo.getActive(), userInfo.getActive(),
userInfo.getLocale(), userInfo.getLocale(),

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

@ -49,8 +49,8 @@ public final class UserMod implements GrantEntity {
/** The internal user name */ /** The internal user name */
@NotNull @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}")
@JsonProperty(USER.ATTR_USER_NAME) @JsonProperty(USER.ATTR_USERNAME)
public final String userName; public final String username;
/** E-mail address of the user */ /** E-mail address of the user */
@Email(message = "user:email:email:_:_:${validatedValue}") @Email(message = "user:email:email:_:_:${validatedValue}")
@ -85,7 +85,7 @@ public final class UserMod implements GrantEntity {
@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_USER_NAME) final String userName, @JsonProperty(USER.ATTR_USERNAME) final String username,
@JsonProperty(ATTR_NAME_NEW_PASSWORD) final String newPassword, @JsonProperty(ATTR_NAME_NEW_PASSWORD) final String newPassword,
@JsonProperty(ATTR_NAME_RETYPED_NEW_PASSWORD) final String retypedNewPassword, @JsonProperty(ATTR_NAME_RETYPED_NEW_PASSWORD) final String retypedNewPassword,
@JsonProperty(USER.ATTR_EMAIL) final String email, @JsonProperty(USER.ATTR_EMAIL) final String email,
@ -99,7 +99,7 @@ public final class UserMod implements GrantEntity {
this.newPassword = newPassword; this.newPassword = newPassword;
this.retypedNewPassword = retypedNewPassword; this.retypedNewPassword = retypedNewPassword;
this.name = name; this.name = name;
this.userName = userName; this.username = username;
this.email = email; this.email = email;
this.locale = locale; this.locale = locale;
this.timeZone = timeZone; this.timeZone = timeZone;
@ -114,7 +114,7 @@ public final class UserMod implements GrantEntity {
this.newPassword = newPassword; this.newPassword = newPassword;
this.retypedNewPassword = retypedNewPassword; this.retypedNewPassword = retypedNewPassword;
this.name = userInfo.name; this.name = userInfo.name;
this.userName = userInfo.userName; this.username = userInfo.username;
this.email = userInfo.email; this.email = userInfo.email;
this.locale = userInfo.locale; this.locale = userInfo.locale;
this.timeZone = userInfo.timeZone; this.timeZone = userInfo.timeZone;
@ -153,8 +153,8 @@ public final class UserMod implements GrantEntity {
return this.name; return this.name;
} }
public String getUserName() { public String getUsername() {
return this.userName; return this.username;
} }
public String getEmail() { public String getEmail() {
@ -188,8 +188,8 @@ public final class UserMod implements GrantEntity {
@Override @Override
public String toString() { public String toString() {
return "UserMod [uuid=" + this.uuid + ", institutionId=" + this.institutionId + ", name=" + this.name return "UserMod [uuid=" + this.uuid + ", institutionId=" + this.institutionId + ", name=" + this.name
+ ", userName=" + ", username="
+ this.userName + ", email=" + this.email + ", locale=" + this.locale + ", timeZone=" + this.timeZone + this.username + ", email=" + this.email + ", locale=" + this.locale + ", timeZone=" + this.timeZone
+ ", roles=" + this.roles + ", roles=" + this.roles
+ ", newPassword=" + this.newPassword + ", retypedNewPassword=" + this.retypedNewPassword + "]"; + ", newPassword=" + this.newPassword + ", retypedNewPassword=" + this.retypedNewPassword + "]";
} }

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

@ -18,23 +18,6 @@ import java.util.stream.Collectors;
public final class Utils { public final class Utils {
// /** Use this to extract a single element from a Collection. This also checks if there is only a single element
// * within the Collection.
// *
// * @param collection the Collection to extract the single and only element
// * @return The single element
// * @throws IllegalArgumentException if the collection is null, or empty or has more then one element */
// public static <T> Result<T> getSingle(final Collection<T> collection) {
// if (collection == null || collection.isEmpty() || collection.size() > 1) {
// return Result.ofError(
// new IllegalArgumentException(
// "Collection has no or more then one element. Expected is exaclty one. Size: " +
// ((collection != null) ? collection.size() : "null")));
// }
//
// return Result.of(collection.iterator().next());
// }
/** Use this to create an immutable Collection of specified type from varargs /** Use this to create an immutable Collection of specified type from varargs
* *
* @param values elements of the new immutable Collection * @param values elements of the new immutable Collection
@ -73,4 +56,8 @@ public final class Utils {
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
public static String toSQLWildcard(final String text) {
return (text == null) ? null : "%" + text + "%";
}
} }

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

@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ClientConnectionRecordDynamicSqlSupport { public final class ClientConnectionRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.959+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.878+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="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.879+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="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.879+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="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.879+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="2018-12-19T13:27:34.960+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.879+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="2018-12-19T13:27:34.960+01:00", comments="Source field: client_connection.user_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.879+01:00", comments="Source field: client_connection.user_name")
public static final SqlColumn<String> userName = clientConnectionRecord.userName; public static final SqlColumn<String> userName = clientConnectionRecord.userName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.960+01:00", comments="Source field: client_connection.vdi") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.879+01:00", comments="Source field: client_connection.vdi")
public static final SqlColumn<Boolean> vdi = clientConnectionRecord.vdi; public static final SqlColumn<Boolean> vdi = clientConnectionRecord.vdi;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.960+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.879+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="2018-12-19T13:27:34.960+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.879+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="2018-12-19T13:27:34.959+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.879+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="2018-12-19T13:27:34.960+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+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="2018-12-19T13:27:34.960+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+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="2018-12-19T13:27:34.960+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+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="2018-12-19T13:27:34.960+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+01:00", comments="Source Table: client_connection")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -59,7 +59,7 @@ public interface ClientConnectionRecordMapper {
}) })
ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); ClientConnectionRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+01:00", comments="Source Table: client_connection")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -73,22 +73,22 @@ public interface ClientConnectionRecordMapper {
}) })
List<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement); List<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+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="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+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="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+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="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+01:00", comments="Source Table: client_connection")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord) return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -96,7 +96,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+01:00", comments="Source Table: client_connection")
default int insert(ClientConnectionRecord record) { default int insert(ClientConnectionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientConnectionRecord) .into(clientConnectionRecord)
@ -111,7 +111,7 @@ public interface ClientConnectionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+01:00", comments="Source Table: client_connection")
default int insertSelective(ClientConnectionRecord record) { default int insertSelective(ClientConnectionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientConnectionRecord) .into(clientConnectionRecord)
@ -126,19 +126,19 @@ public interface ClientConnectionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+01:00", comments="Source Table: client_connection")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) return SelectDSL.selectWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress)
.from(clientConnectionRecord); .from(clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.880+01:00", comments="Source Table: client_connection")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress)
.from(clientConnectionRecord); .from(clientConnectionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.881+01:00", comments="Source Table: client_connection")
default ClientConnectionRecord selectByPrimaryKey(Long id_) { default ClientConnectionRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) return SelectDSL.selectWithMapper(this::selectOne, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress)
.from(clientConnectionRecord) .from(clientConnectionRecord)
@ -147,7 +147,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.881+01:00", comments="Source Table: client_connection")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientConnectionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -159,7 +159,7 @@ public interface ClientConnectionRecordMapper {
.set(virtualClientAddress).equalTo(record::getVirtualClientAddress); .set(virtualClientAddress).equalTo(record::getVirtualClientAddress);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.961+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.881+01:00", comments="Source Table: client_connection")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientConnectionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)
@ -171,7 +171,7 @@ public interface ClientConnectionRecordMapper {
.set(virtualClientAddress).equalToWhenPresent(record::getVirtualClientAddress); .set(virtualClientAddress).equalToWhenPresent(record::getVirtualClientAddress);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.962+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.881+01:00", comments="Source Table: client_connection")
default int updateByPrimaryKey(ClientConnectionRecord record) { default int updateByPrimaryKey(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -186,7 +186,7 @@ public interface ClientConnectionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.962+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.881+01:00", comments="Source Table: client_connection")
default int updateByPrimaryKeySelective(ClientConnectionRecord record) { default int updateByPrimaryKeySelective(ClientConnectionRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)

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

@ -7,31 +7,31 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ClientEventRecordDynamicSqlSupport { public final class ClientEventRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.963+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.884+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="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.884+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="2018-12-19T13:27:34.964+01:00", comments="Source field: client_event.connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.884+01:00", comments="Source field: client_event.connection_id")
public static final SqlColumn<Long> connectionId = clientEventRecord.connectionId; public static final SqlColumn<Long> connectionId = clientEventRecord.connectionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.964+01:00", comments="Source field: client_event.user_identifier") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+01:00", comments="Source field: client_event.user_identifier")
public static final SqlColumn<String> userIdentifier = clientEventRecord.userIdentifier; public static final SqlColumn<String> userIdentifier = clientEventRecord.userIdentifier;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.964+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+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="2018-12-19T13:27:34.964+01:00", comments="Source field: client_event.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+01:00", comments="Source field: client_event.timestamp")
public static final SqlColumn<Long> timestamp = clientEventRecord.timestamp; public static final SqlColumn<Long> timestamp = clientEventRecord.timestamp;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.964+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+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="2018-12-19T13:27:34.964+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+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="2018-12-19T13:27:34.963+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.884+01:00", comments="Source Table: client_event")
public static final class ClientEventRecord extends SqlTable { public static final class ClientEventRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ClientEventRecordMapper { public interface ClientEventRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.964+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+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="2018-12-19T13:27:34.964+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+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="2018-12-19T13:27:34.964+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+01:00", comments="Source Table: client_event")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ClientEventRecord> insertStatement); int insert(InsertStatementProvider<ClientEventRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.964+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+01:00", comments="Source Table: client_event")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -59,7 +59,7 @@ public interface ClientEventRecordMapper {
}) })
ClientEventRecord selectOne(SelectStatementProvider selectStatement); ClientEventRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.964+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+01:00", comments="Source Table: client_event")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -72,22 +72,22 @@ public interface ClientEventRecordMapper {
}) })
List<ClientEventRecord> selectMany(SelectStatementProvider selectStatement); List<ClientEventRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.964+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.885+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="2018-12-19T13:27:34.964+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+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="2018-12-19T13:27:34.964+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+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="2018-12-19T13:27:34.964+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+01:00", comments="Source Table: client_event")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord) return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -95,7 +95,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.964+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+01:00", comments="Source Table: client_event")
default int insert(ClientEventRecord record) { default int insert(ClientEventRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(clientEventRecord) .into(clientEventRecord)
@ -109,7 +109,7 @@ public interface ClientEventRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.965+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+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="2018-12-19T13:27:34.965+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+01:00", comments="Source Table: client_event")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text) return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
.from(clientEventRecord); .from(clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.965+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+01:00", comments="Source Table: client_event")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
.from(clientEventRecord); .from(clientEventRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.965+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+01:00", comments="Source Table: client_event")
default ClientEventRecord selectByPrimaryKey(Long id_) { default ClientEventRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, userIdentifier, type, timestamp, numericValue, text) return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
.from(clientEventRecord) .from(clientEventRecord)
@ -144,7 +144,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.965+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+01:00", comments="Source Table: client_event")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientEventRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(connectionId).equalTo(record::getConnectionId) .set(connectionId).equalTo(record::getConnectionId)
@ -155,7 +155,7 @@ public interface ClientEventRecordMapper {
.set(text).equalTo(record::getText); .set(text).equalTo(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.965+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+01:00", comments="Source Table: client_event")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientEventRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(connectionId).equalToWhenPresent(record::getConnectionId) .set(connectionId).equalToWhenPresent(record::getConnectionId)
@ -166,7 +166,7 @@ public interface ClientEventRecordMapper {
.set(text).equalToWhenPresent(record::getText); .set(text).equalToWhenPresent(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.965+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+01:00", comments="Source Table: client_event")
default int updateByPrimaryKey(ClientEventRecord record) { default int updateByPrimaryKey(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(connectionId).equalTo(record::getConnectionId) .set(connectionId).equalTo(record::getConnectionId)
@ -180,7 +180,7 @@ public interface ClientEventRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.965+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.886+01:00", comments="Source Table: client_event")
default int updateByPrimaryKeySelective(ClientEventRecord record) { default int updateByPrimaryKeySelective(ClientEventRecord record) {
return UpdateDSL.updateWithMapper(this::update, clientEventRecord) return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
.set(connectionId).equalToWhenPresent(record::getConnectionId) .set(connectionId).equalToWhenPresent(record::getConnectionId)

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

@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationAttributeRecordDynamicSqlSupport { public final class ConfigurationAttributeRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.780+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.575+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="2018-12-19T13:27:34.782+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.580+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="2018-12-19T13:27:34.783+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.581+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="2018-12-19T13:27:34.783+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.581+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="2018-12-19T13:27:34.783+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.582+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="2018-12-19T13:27:34.784+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.582+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="2018-12-19T13:27:34.784+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.582+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="2018-12-19T13:27:34.784+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.582+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="2018-12-19T13:27:34.784+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.582+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="2018-12-19T13:27:34.782+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.580+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="2018-12-19T13:27:34.785+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.584+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="2018-12-19T13:27:34.786+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.585+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="2018-12-19T13:27:34.787+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.586+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="2018-12-19T13:27:34.788+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.588+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="2018-12-19T13:27:34.789+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.589+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="2018-12-19T13:27:34.790+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.590+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="2018-12-19T13:27:34.791+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.591+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="2018-12-19T13:27:34.791+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.592+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="2018-12-19T13:27:34.792+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.593+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="2018-12-19T13:27:34.792+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.593+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="2018-12-19T13:27:34.793+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.595+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="2018-12-19T13:27:34.794+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.596+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="2018-12-19T13:27:34.795+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.597+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="2018-12-19T13:27:34.796+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.598+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="2018-12-19T13:27:34.797+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.599+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="2018-12-19T13:27:34.797+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.600+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="2018-12-19T13:27:34.798+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.602+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="2018-12-19T13:27:34.799+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.603+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="2018-12-19T13:27:34.947+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.836+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="2018-12-19T13:27:34.947+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.836+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="2018-12-19T13:27:34.947+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.837+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="2018-12-19T13:27:34.947+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.838+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="2018-12-19T13:27:34.947+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.838+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="2018-12-19T13:27:34.947+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.838+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="2018-12-19T13:27:34.947+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.838+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="2018-12-19T13:27:34.948+01:00", comments="Source field: configuration_node.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.838+01:00", comments="Source field: configuration_node.template")
public static final SqlColumn<String> template = configurationNodeRecord.template; public static final SqlColumn<String> template = configurationNodeRecord.template;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.948+01:00", comments="Source field: configuration_node.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.839+01:00", comments="Source field: configuration_node.active")
public static final SqlColumn<Integer> active = configurationNodeRecord.active; public static final SqlColumn<Integer> active = configurationNodeRecord.active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.947+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.836+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.839+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.839+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.839+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.839+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.839+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.839+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.839+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.840+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.840+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.840+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.840+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="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.840+01:00", comments="Source Table: configuration_node")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active)
.from(configurationNodeRecord); .from(configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.840+01:00", comments="Source Table: configuration_node")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active)
.from(configurationNodeRecord); .from(configurationNodeRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.948+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.840+01:00", comments="Source Table: configuration_node")
default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { default ConfigurationNodeRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, name, description, type, template, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, name, description, type, template, active)
.from(configurationNodeRecord) .from(configurationNodeRecord)
@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.949+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.840+01:00", comments="Source Table: configuration_node")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationNodeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -159,7 +159,7 @@ public interface ConfigurationNodeRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.949+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.841+01:00", comments="Source Table: configuration_node")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationNodeRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -171,7 +171,7 @@ public interface ConfigurationNodeRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.949+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.841+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="2018-12-19T13:27:34.949+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.841+01:00", comments="Source Table: configuration_node")
default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) { default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -7,25 +7,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationRecordDynamicSqlSupport { public final class ConfigurationRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.941+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.826+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="2018-12-19T13:27:34.941+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.826+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="2018-12-19T13:27:34.942+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.826+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="2018-12-19T13:27:34.942+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.826+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="2018-12-19T13:27:34.942+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.826+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="2018-12-19T13:27:34.942+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.827+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="2018-12-19T13:27:34.941+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.826+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="2018-12-19T13:27:34.942+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.829+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="2018-12-19T13:27:34.942+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.829+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="2018-12-19T13:27:34.942+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.830+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="2018-12-19T13:27:34.942+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.830+01:00", comments="Source Table: configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -58,7 +58,7 @@ public interface ConfigurationRecordMapper {
}) })
ConfigurationRecord selectOne(SelectStatementProvider selectStatement); ConfigurationRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.942+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.831+01:00", comments="Source Table: configuration")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -69,22 +69,22 @@ public interface ConfigurationRecordMapper {
}) })
List<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.831+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="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.831+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="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.831+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="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.831+01:00", comments="Source Table: configuration")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -92,7 +92,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.831+01:00", comments="Source Table: configuration")
default int insert(ConfigurationRecord record) { default int insert(ConfigurationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationRecord) .into(configurationRecord)
@ -104,7 +104,7 @@ public interface ConfigurationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.831+01:00", comments="Source Table: configuration")
default int insertSelective(ConfigurationRecord record) { default int insertSelective(ConfigurationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationRecord) .into(configurationRecord)
@ -116,19 +116,19 @@ public interface ConfigurationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.832+01:00", comments="Source Table: configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup) return SelectDSL.selectWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup)
.from(configurationRecord); .from(configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.832+01:00", comments="Source Table: configuration")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup)
.from(configurationRecord); .from(configurationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.832+01:00", comments="Source Table: configuration")
default ConfigurationRecord selectByPrimaryKey(Long id_) { default ConfigurationRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, configurationNodeId, version, versionDate, followup) return SelectDSL.selectWithMapper(this::selectOne, id, configurationNodeId, version, versionDate, followup)
.from(configurationRecord) .from(configurationRecord)
@ -137,7 +137,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.832+01:00", comments="Source Table: configuration")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(configurationNodeId).equalTo(record::getConfigurationNodeId) .set(configurationNodeId).equalTo(record::getConfigurationNodeId)
@ -146,7 +146,7 @@ public interface ConfigurationRecordMapper {
.set(followup).equalTo(record::getFollowup); .set(followup).equalTo(record::getFollowup);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.943+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.832+01:00", comments="Source Table: configuration")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId) .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId)
@ -155,7 +155,7 @@ public interface ConfigurationRecordMapper {
.set(followup).equalToWhenPresent(record::getFollowup); .set(followup).equalToWhenPresent(record::getFollowup);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.944+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.832+01:00", comments="Source Table: configuration")
default int updateByPrimaryKey(ConfigurationRecord record) { default int updateByPrimaryKey(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(configurationNodeId).equalTo(record::getConfigurationNodeId) .set(configurationNodeId).equalTo(record::getConfigurationNodeId)
@ -167,7 +167,7 @@ public interface ConfigurationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.944+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.832+01:00", comments="Source Table: configuration")
default int updateByPrimaryKeySelective(ConfigurationRecord record) { default int updateByPrimaryKeySelective(ConfigurationRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationRecord) return UpdateDSL.updateWithMapper(this::update, configurationRecord)
.set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId) .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId)

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

@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ConfigurationValueRecordDynamicSqlSupport { public final class ConfigurationValueRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.931+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.811+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="2018-12-19T13:27:34.931+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.811+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="2018-12-19T13:27:34.931+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.811+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="2018-12-19T13:27:34.931+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.811+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="2018-12-19T13:27:34.931+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.812+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="2018-12-19T13:27:34.932+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.812+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="2018-12-19T13:27:34.932+01:00", comments="Source field: configuration_value.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.812+01:00", comments="Source field: configuration_value.text")
public static final SqlColumn<String> text = configurationValueRecord.text; public static final SqlColumn<String> text = configurationValueRecord.text;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.931+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.811+01:00", comments="Source Table: configuration_value")
public static final class ConfigurationValueRecord extends SqlTable { public static final class ConfigurationValueRecord extends SqlTable {
public final SqlColumn<Long> id = column("id", JDBCType.BIGINT); public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);

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

@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@Mapper @Mapper
public interface ConfigurationValueRecordMapper { public interface ConfigurationValueRecordMapper {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.932+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.812+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="2018-12-19T13:27:34.932+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.812+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="2018-12-19T13:27:34.932+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.812+01:00", comments="Source Table: configuration_value")
@InsertProvider(type=SqlProviderAdapter.class, method="insert") @InsertProvider(type=SqlProviderAdapter.class, method="insert")
@SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
int insert(InsertStatementProvider<ConfigurationValueRecord> insertStatement); int insert(InsertStatementProvider<ConfigurationValueRecord> insertStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.932+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.812+01:00", comments="Source Table: configuration_value")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -57,7 +57,7 @@ public interface ConfigurationValueRecordMapper {
}) })
ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement); ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.932+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.813+01:00", comments="Source Table: configuration_value")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -69,22 +69,22 @@ public interface ConfigurationValueRecordMapper {
}) })
List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement); List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.813+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="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.813+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="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.813+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="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.813+01:00", comments="Source Table: configuration_value")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord) return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -92,7 +92,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.813+01:00", comments="Source Table: configuration_value")
default int insert(ConfigurationValueRecord record) { default int insert(ConfigurationValueRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(configurationValueRecord) .into(configurationValueRecord)
@ -105,7 +105,7 @@ public interface ConfigurationValueRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.813+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="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.814+01:00", comments="Source Table: configuration_value")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text) return SelectDSL.selectWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text)
.from(configurationValueRecord); .from(configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.814+01:00", comments="Source Table: configuration_value")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text)
.from(configurationValueRecord); .from(configurationValueRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.814+01:00", comments="Source Table: configuration_value")
default ConfigurationValueRecord selectByPrimaryKey(Long id_) { default ConfigurationValueRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, configurationId, configurationAttributeId, listIndex, value, text) return SelectDSL.selectWithMapper(this::selectOne, id, configurationId, configurationAttributeId, listIndex, value, text)
.from(configurationValueRecord) .from(configurationValueRecord)
@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.814+01:00", comments="Source Table: configuration_value")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(configurationId).equalTo(record::getConfigurationId) .set(configurationId).equalTo(record::getConfigurationId)
@ -149,7 +149,7 @@ public interface ConfigurationValueRecordMapper {
.set(text).equalTo(record::getText); .set(text).equalTo(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.933+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.814+01:00", comments="Source Table: configuration_value")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(configurationId).equalToWhenPresent(record::getConfigurationId) .set(configurationId).equalToWhenPresent(record::getConfigurationId)
@ -159,7 +159,7 @@ public interface ConfigurationValueRecordMapper {
.set(text).equalToWhenPresent(record::getText); .set(text).equalToWhenPresent(record::getText);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.934+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.814+01:00", comments="Source Table: configuration_value")
default int updateByPrimaryKey(ConfigurationValueRecord record) { default int updateByPrimaryKey(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(configurationId).equalTo(record::getConfigurationId) .set(configurationId).equalTo(record::getConfigurationId)
@ -172,7 +172,7 @@ public interface ConfigurationValueRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.934+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.814+01:00", comments="Source Table: configuration_value")
default int updateByPrimaryKeySelective(ConfigurationValueRecord record) { default int updateByPrimaryKeySelective(ConfigurationValueRecord record) {
return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
.set(configurationId).equalToWhenPresent(record::getConfigurationId) .set(configurationId).equalToWhenPresent(record::getConfigurationId)

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

@ -6,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class ExamConfigurationMapRecordDynamicSqlSupport { public final class ExamConfigurationMapRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.950+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.843+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="2018-12-19T13:27:34.950+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.843+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="2018-12-19T13:27:34.950+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.843+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="2018-12-19T13:27:34.950+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.843+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="2018-12-19T13:27:34.950+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.843+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="2018-12-19T13:27:34.950+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.843+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="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.844+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="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.844+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="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.844+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="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.844+01:00", comments="Source Table: exam_configuration_map")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -55,7 +55,7 @@ public interface ExamConfigurationMapRecordMapper {
}) })
ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement); ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.844+01:00", comments="Source Table: exam_configuration_map")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -65,22 +65,22 @@ public interface ExamConfigurationMapRecordMapper {
}) })
List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement); List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.844+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="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.844+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="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.844+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="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.845+01:00", comments="Source Table: exam_configuration_map")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord) return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -88,7 +88,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.845+01:00", comments="Source Table: exam_configuration_map")
default int insert(ExamConfigurationMapRecord record) { default int insert(ExamConfigurationMapRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examConfigurationMapRecord) .into(examConfigurationMapRecord)
@ -99,7 +99,7 @@ public interface ExamConfigurationMapRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.845+01:00", comments="Source Table: exam_configuration_map")
default int insertSelective(ExamConfigurationMapRecord record) { default int insertSelective(ExamConfigurationMapRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(examConfigurationMapRecord) .into(examConfigurationMapRecord)
@ -110,19 +110,19 @@ public interface ExamConfigurationMapRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.845+01:00", comments="Source Table: exam_configuration_map")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, examId, configurationNodeId, userNames) return SelectDSL.selectWithMapper(this::selectMany, id, examId, configurationNodeId, userNames)
.from(examConfigurationMapRecord); .from(examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.845+01:00", comments="Source Table: exam_configuration_map")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, configurationNodeId, userNames) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, configurationNodeId, userNames)
.from(examConfigurationMapRecord); .from(examConfigurationMapRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.845+01:00", comments="Source Table: exam_configuration_map")
default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) { default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, examId, configurationNodeId, userNames) return SelectDSL.selectWithMapper(this::selectOne, id, examId, configurationNodeId, userNames)
.from(examConfigurationMapRecord) .from(examConfigurationMapRecord)
@ -131,7 +131,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.845+01:00", comments="Source Table: exam_configuration_map")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper {
.set(userNames).equalTo(record::getUserNames); .set(userNames).equalTo(record::getUserNames);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.845+01:00", comments="Source Table: exam_configuration_map")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)
@ -147,7 +147,7 @@ public interface ExamConfigurationMapRecordMapper {
.set(userNames).equalToWhenPresent(record::getUserNames); .set(userNames).equalToWhenPresent(record::getUserNames);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.845+01:00", comments="Source Table: exam_configuration_map")
default int updateByPrimaryKey(ExamConfigurationMapRecord record) { default int updateByPrimaryKey(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(examId).equalTo(record::getExamId) .set(examId).equalTo(record::getExamId)
@ -158,7 +158,7 @@ public interface ExamConfigurationMapRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.951+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.846+01:00", comments="Source Table: exam_configuration_map")
default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) { default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) {
return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)

20
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.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 ExamRecordDynamicSqlSupport { public final class ExamRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.953+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.852+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="2018-12-19T13:27:34.954+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.853+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="2018-12-19T13:27:34.954+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.854+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="2018-12-19T13:27:34.954+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.854+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="2018-12-19T13:27:34.954+01:00", comments="Source field: exam.external_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.855+01:00", comments="Source field: exam.external_uuid")
public static final SqlColumn<String> externalUuid = examRecord.externalUuid; public static final SqlColumn<String> externalUuid = examRecord.externalUuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.954+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.855+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="2018-12-19T13:27:34.954+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.855+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="2018-12-19T13:27:34.955+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.856+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="2018-12-19T13:27:34.955+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.856+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="2018-12-19T13:27:34.954+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.853+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="2018-12-19T13:27:34.955+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.856+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="2018-12-19T13:27:34.955+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.856+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="2018-12-19T13:27:34.955+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.856+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="2018-12-19T13:27:34.955+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.856+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),
@ -59,7 +59,7 @@ public interface ExamRecordMapper {
}) })
ExamRecord selectOne(SelectStatementProvider selectStatement); ExamRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.955+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.856+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),
@ -73,22 +73,22 @@ public interface ExamRecordMapper {
}) })
List<ExamRecord> selectMany(SelectStatementProvider selectStatement); List<ExamRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.955+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.856+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="2018-12-19T13:27:34.955+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.857+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="2018-12-19T13:27:34.955+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.857+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="2018-12-19T13:27:34.955+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.857+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_))
@ -96,7 +96,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.955+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.857+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)
@ -111,7 +111,7 @@ public interface ExamRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.956+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.857+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)
@ -126,19 +126,19 @@ public interface ExamRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.956+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.857+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, externalUuid, owner, supporter, type, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalUuid, owner, supporter, type, active)
.from(examRecord); .from(examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.956+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.857+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, externalUuid, owner, supporter, type, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalUuid, owner, supporter, type, active)
.from(examRecord); .from(examRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.956+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.857+01:00", comments="Source Table: exam")
default ExamRecord selectByPrimaryKey(Long id_) { default ExamRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalUuid, owner, supporter, type, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalUuid, owner, supporter, type, active)
.from(examRecord) .from(examRecord)
@ -147,7 +147,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.956+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.857+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)
@ -159,7 +159,7 @@ public interface ExamRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.956+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.858+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)
@ -171,7 +171,7 @@ public interface ExamRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.956+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.858+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)
@ -186,7 +186,7 @@ public interface ExamRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.956+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.858+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="2018-12-19T13:27:34.967+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+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="2018-12-19T13:27:34.967+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+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="2018-12-19T13:27:34.967+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.891+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="2018-12-19T13:27:34.967+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.891+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="2018-12-19T13:27:34.967+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.891+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="2018-12-19T13:27:34.967+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.891+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="2018-12-19T13:27:34.967+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+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="2018-12-19T13:27:34.967+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.891+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="2018-12-19T13:27:34.967+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.891+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="2018-12-19T13:27:34.967+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.891+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="2018-12-19T13:27:34.967+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.891+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.891+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.892+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="2018-12-19T13:27:34.968+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.893+01:00", comments="Source Table: indicator")
default int updateByPrimaryKeySelective(IndicatorRecord record) { default int updateByPrimaryKeySelective(IndicatorRecord record) {
return UpdateDSL.updateWithMapper(this::update, indicatorRecord) return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
.set(examId).equalToWhenPresent(record::getExamId) .set(examId).equalToWhenPresent(record::getExamId)

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

@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class InstitutionRecordDynamicSqlSupport { public final class InstitutionRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.969+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.894+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="2018-12-19T13:27:34.970+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.894+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="2018-12-19T13:27:34.970+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.895+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="2018-12-19T13:27:34.970+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.895+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="2018-12-19T13:27:34.970+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.895+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="2018-12-19T13:27:34.970+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.895+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="2018-12-19T13:27:34.970+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.894+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="2018-12-19T13:27:34.970+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.895+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="2018-12-19T13:27:34.970+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.895+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="2018-12-19T13:27:34.970+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.895+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="2018-12-19T13:27:34.970+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.895+01:00", comments="Source Table: institution")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -56,7 +56,7 @@ public interface InstitutionRecordMapper {
}) })
InstitutionRecord selectOne(SelectStatementProvider selectStatement); InstitutionRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.895+01:00", comments="Source Table: institution")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -67,22 +67,22 @@ public interface InstitutionRecordMapper {
}) })
List<InstitutionRecord> selectMany(SelectStatementProvider selectStatement); List<InstitutionRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+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="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+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="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+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="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+01:00", comments="Source Table: institution")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -90,7 +90,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+01:00", comments="Source Table: institution")
default int insert(InstitutionRecord record) { default int insert(InstitutionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(institutionRecord) .into(institutionRecord)
@ -102,7 +102,7 @@ public interface InstitutionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+01:00", comments="Source Table: institution")
default int insertSelective(InstitutionRecord record) { default int insertSelective(InstitutionRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(institutionRecord) .into(institutionRecord)
@ -114,19 +114,19 @@ public interface InstitutionRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+01:00", comments="Source Table: institution")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage) return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage)
.from(institutionRecord); .from(institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+01:00", comments="Source Table: institution")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage)
.from(institutionRecord); .from(institutionRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+01:00", comments="Source Table: institution")
default InstitutionRecord selectByPrimaryKey(Long id_) { default InstitutionRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, active, logoImage) return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, active, logoImage)
.from(institutionRecord) .from(institutionRecord)
@ -135,7 +135,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+01:00", comments="Source Table: institution")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(InstitutionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -144,7 +144,7 @@ public interface InstitutionRecordMapper {
.set(logoImage).equalTo(record::getLogoImage); .set(logoImage).equalTo(record::getLogoImage);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.896+01:00", comments="Source Table: institution")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(InstitutionRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)
@ -153,7 +153,7 @@ public interface InstitutionRecordMapper {
.set(logoImage).equalToWhenPresent(record::getLogoImage); .set(logoImage).equalToWhenPresent(record::getLogoImage);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.897+01:00", comments="Source Table: institution")
default int updateByPrimaryKey(InstitutionRecord record) { default int updateByPrimaryKey(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalTo(record::getName) .set(name).equalTo(record::getName)
@ -165,7 +165,7 @@ public interface InstitutionRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.971+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.897+01:00", comments="Source Table: institution")
default int updateByPrimaryKeySelective(InstitutionRecord record) { default int updateByPrimaryKeySelective(InstitutionRecord record) {
return UpdateDSL.updateWithMapper(this::update, institutionRecord) return UpdateDSL.updateWithMapper(this::update, institutionRecord)
.set(name).equalToWhenPresent(record::getName) .set(name).equalToWhenPresent(record::getName)

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

@ -6,43 +6,43 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class LmsSetupRecordDynamicSqlSupport { public final class LmsSetupRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.973+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+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="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.899+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="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.899+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="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.899+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="2018-12-19T13:27:34.974+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.899+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="2018-12-19T13:27:34.974+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.899+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="2018-12-19T13:27:34.974+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.899+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="2018-12-19T13:27:34.974+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.899+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="2018-12-19T13:27:34.974+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.899+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="2018-12-19T13:27:34.974+01:00", comments="Source field: lms_setup.seb_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+01:00", comments="Source field: lms_setup.seb_clientname")
public static final SqlColumn<String> sebClientname = lmsSetupRecord.sebClientname; public static final SqlColumn<String> sebClientname = lmsSetupRecord.sebClientname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.974+01:00", comments="Source field: lms_setup.seb_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+01:00", comments="Source field: lms_setup.seb_clientsecret")
public static final SqlColumn<String> sebClientsecret = lmsSetupRecord.sebClientsecret; public static final SqlColumn<String> sebClientsecret = lmsSetupRecord.sebClientsecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.974+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+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="2018-12-19T13:27:34.973+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.899+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="2018-12-19T13:27:34.974+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+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="2018-12-19T13:27:34.974+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+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="2018-12-19T13:27:34.974+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+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="2018-12-19T13:27:34.974+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+01:00", comments="Source Table: lms_setup")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -62,7 +62,7 @@ public interface LmsSetupRecordMapper {
}) })
LmsSetupRecord selectOne(SelectStatementProvider selectStatement); LmsSetupRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.974+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+01:00", comments="Source Table: lms_setup")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -79,22 +79,22 @@ public interface LmsSetupRecordMapper {
}) })
List<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement); List<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.974+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+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="2018-12-19T13:27:34.974+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+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="2018-12-19T13:27:34.974+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+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="2018-12-19T13:27:34.975+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+01:00", comments="Source Table: lms_setup")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord) return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -102,7 +102,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.975+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+01:00", comments="Source Table: lms_setup")
default int insert(LmsSetupRecord record) { default int insert(LmsSetupRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(lmsSetupRecord) .into(lmsSetupRecord)
@ -120,7 +120,7 @@ public interface LmsSetupRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.975+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+01:00", comments="Source Table: lms_setup")
default int insertSelective(LmsSetupRecord record) { default int insertSelective(LmsSetupRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(lmsSetupRecord) .into(lmsSetupRecord)
@ -138,19 +138,19 @@ public interface LmsSetupRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.975+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.900+01:00", comments="Source Table: lms_setup")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active)
.from(lmsSetupRecord); .from(lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.975+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.901+01:00", comments="Source Table: lms_setup")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active)
.from(lmsSetupRecord); .from(lmsSetupRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.975+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.901+01:00", comments="Source Table: lms_setup")
default LmsSetupRecord selectByPrimaryKey(Long id_) { default LmsSetupRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active)
.from(lmsSetupRecord) .from(lmsSetupRecord)
@ -159,7 +159,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.975+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.901+01:00", comments="Source Table: lms_setup")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(LmsSetupRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -174,7 +174,7 @@ public interface LmsSetupRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.975+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.910+01:00", comments="Source Table: lms_setup")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(LmsSetupRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@ -189,7 +189,7 @@ public interface LmsSetupRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.975+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.911+01:00", comments="Source Table: lms_setup")
default int updateByPrimaryKey(LmsSetupRecord record) { default int updateByPrimaryKey(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalTo(record::getInstitutionId) .set(institutionId).equalTo(record::getInstitutionId)
@ -207,7 +207,7 @@ public interface LmsSetupRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.975+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.911+01:00", comments="Source Table: lms_setup")
default int updateByPrimaryKeySelective(LmsSetupRecord record) { default int updateByPrimaryKeySelective(LmsSetupRecord record) {
return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord) return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
.set(institutionId).equalToWhenPresent(record::getInstitutionId) .set(institutionId).equalToWhenPresent(record::getInstitutionId)

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

@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class OrientationRecordDynamicSqlSupport { public final class OrientationRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.936+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.817+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="2018-12-19T13:27:34.936+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.817+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="2018-12-19T13:27:34.936+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.818+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="2018-12-19T13:27:34.936+01:00", comments="Source field: orientation.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.818+01:00", comments="Source field: orientation.template")
public static final SqlColumn<String> template = orientationRecord.template; public static final SqlColumn<String> template = orientationRecord.template;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.936+01:00", comments="Source field: orientation.view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.818+01:00", comments="Source field: orientation.view")
public static final SqlColumn<String> view = orientationRecord.view; public static final SqlColumn<String> view = orientationRecord.view;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.936+01:00", comments="Source field: orientation.group") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.818+01:00", comments="Source field: orientation.group")
public static final SqlColumn<String> group = orientationRecord.group; public static final SqlColumn<String> group = orientationRecord.group;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.936+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.818+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="2018-12-19T13:27:34.937+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.818+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="2018-12-19T13:27:34.937+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.818+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="2018-12-19T13:27:34.937+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.819+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="2018-12-19T13:27:34.936+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.817+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="2018-12-19T13:27:34.937+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.819+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="2018-12-19T13:27:34.937+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.819+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="2018-12-19T13:27:34.937+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.819+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="2018-12-19T13:27:34.937+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.819+01:00", comments="Source Table: orientation")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -60,7 +60,7 @@ public interface OrientationRecordMapper {
}) })
OrientationRecord selectOne(SelectStatementProvider selectStatement); OrientationRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.937+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.819+01:00", comments="Source Table: orientation")
@SelectProvider(type=SqlProviderAdapter.class, method="select") @SelectProvider(type=SqlProviderAdapter.class, method="select")
@ConstructorArgs({ @ConstructorArgs({
@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@ -75,22 +75,22 @@ public interface OrientationRecordMapper {
}) })
List<OrientationRecord> selectMany(SelectStatementProvider selectStatement); List<OrientationRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.938+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.819+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="2018-12-19T13:27:34.938+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.819+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="2018-12-19T13:27:34.938+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.819+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="2018-12-19T13:27:34.938+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.819+01:00", comments="Source Table: orientation")
default int deleteByPrimaryKey(Long id_) { default int deleteByPrimaryKey(Long id_) {
return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord) return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord)
.where(id, isEqualTo(id_)) .where(id, isEqualTo(id_))
@ -98,7 +98,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.938+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.820+01:00", comments="Source Table: orientation")
default int insert(OrientationRecord record) { default int insert(OrientationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(orientationRecord) .into(orientationRecord)
@ -114,7 +114,7 @@ public interface OrientationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.938+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.820+01:00", comments="Source Table: orientation")
default int insertSelective(OrientationRecord record) { default int insertSelective(OrientationRecord record) {
return insert(SqlBuilder.insert(record) return insert(SqlBuilder.insert(record)
.into(orientationRecord) .into(orientationRecord)
@ -130,19 +130,19 @@ public interface OrientationRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.938+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.821+01:00", comments="Source Table: orientation")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
.from(orientationRecord); .from(orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.938+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.821+01:00", comments="Source Table: orientation")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
.from(orientationRecord); .from(orientationRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.938+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.821+01:00", comments="Source Table: orientation")
default OrientationRecord selectByPrimaryKey(Long id_) { default OrientationRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
.from(orientationRecord) .from(orientationRecord)
@ -151,7 +151,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.938+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.821+01:00", comments="Source Table: orientation")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalTo(record::getConfigAttributeId) .set(configAttributeId).equalTo(record::getConfigAttributeId)
@ -164,7 +164,7 @@ public interface OrientationRecordMapper {
.set(height).equalTo(record::getHeight); .set(height).equalTo(record::getHeight);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.939+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.821+01:00", comments="Source Table: orientation")
default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) { default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)
@ -177,7 +177,7 @@ public interface OrientationRecordMapper {
.set(height).equalToWhenPresent(record::getHeight); .set(height).equalToWhenPresent(record::getHeight);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.939+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.821+01:00", comments="Source Table: orientation")
default int updateByPrimaryKey(OrientationRecord record) { default int updateByPrimaryKey(OrientationRecord record) {
return UpdateDSL.updateWithMapper(this::update, orientationRecord) return UpdateDSL.updateWithMapper(this::update, orientationRecord)
.set(configAttributeId).equalTo(record::getConfigAttributeId) .set(configAttributeId).equalTo(record::getConfigAttributeId)
@ -193,7 +193,7 @@ public interface OrientationRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.939+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.822+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.917+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="2018-12-19T13:27:34.992+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.918+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="2018-12-19T13:27:34.992+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.918+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="2018-12-19T13:27:34.992+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.918+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.918+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.918+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.918+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.992+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.993+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.993+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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="2018-12-19T13:27:34.993+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.919+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)

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="2018-12-19T13:27:34.993+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+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="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+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="2018-12-19T13:27:34.994+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.922+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="2018-12-19T13:27:34.994+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.922+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="2018-12-19T13:27:34.994+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.922+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="2018-12-19T13:27:34.994+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.922+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="2018-12-19T13:27:34.994+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.922+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="2018-12-19T13:27:34.994+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.922+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="2018-12-19T13:27:34.993+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+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="2018-12-19T13:27:34.994+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.922+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="2018-12-19T13:27:34.994+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.922+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="2018-12-19T13:27:34.994+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.923+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="2018-12-19T13:27:34.994+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.923+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="2018-12-19T13:27:34.994+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.923+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="2018-12-19T13:27:34.994+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.924+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="2018-12-19T13:27:34.994+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.994+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.994+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.995+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.995+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.995+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.995+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.995+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.995+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.996+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.996+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+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="2018-12-19T13:27:34.996+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.925+01:00", comments="Source Table: user_activity_log")
default int updateByPrimaryKeySelective(UserActivityLogRecord record) { default int updateByPrimaryKeySelective(UserActivityLogRecord record) {
return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord) return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord)
.set(userUuid).equalToWhenPresent(record::getUserUuid) .set(userUuid).equalToWhenPresent(record::getUserUuid)

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

@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
public final class UserRecordDynamicSqlSupport { public final class UserRecordDynamicSqlSupport {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.987+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.914+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="2018-12-19T13:27:34.987+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.914+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="2018-12-19T13:27:34.988+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.914+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="2018-12-19T13:27:34.988+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.914+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="2018-12-19T13:27:34.988+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.914+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="2018-12-19T13:27:34.989+01:00", comments="Source field: user.user_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.914+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="2018-12-19T13:27:34.989+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="2018-12-19T13:27:34.989+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="2018-12-19T13:27:34.989+01:00", comments="Source field: user.locale") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+01:00", comments="Source field: user.locale")
public static final SqlColumn<String> locale = userRecord.locale; public static final SqlColumn<String> locale = userRecord.locale;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.989+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="2018-12-19T13:27:34.989+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="2018-12-19T13:27:34.987+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.914+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,7 +49,7 @@ 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> userName = column("user_name", 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);

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

@ -32,27 +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="2018-12-19T13:27:34.989+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="2018-12-19T13:27:34.989+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="2018-12-19T13:27:34.989+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="2018-12-19T13:27:34.989+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="user_name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="username", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="password", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="password", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="email", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="email", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="locale", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="locale", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@ -61,14 +61,14 @@ public interface UserRecordMapper {
}) })
UserRecord selectOne(SelectStatementProvider selectStatement); UserRecord selectOne(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="user_name", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="username", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="password", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="password", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="email", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="email", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@Arg(column="locale", javaType=String.class, jdbcType=JdbcType.VARCHAR), @Arg(column="locale", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@ -77,22 +77,22 @@ public interface UserRecordMapper {
}) })
List<UserRecord> selectMany(SelectStatementProvider selectStatement); List<UserRecord> selectMany(SelectStatementProvider selectStatement);
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.915+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="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+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="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+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,14 +100,14 @@ public interface UserRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+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(userName).toProperty("userName") .map(username).toProperty("username")
.map(password).toProperty("password") .map(password).toProperty("password")
.map(email).toProperty("email") .map(email).toProperty("email")
.map(locale).toProperty("locale") .map(locale).toProperty("locale")
@ -117,14 +117,14 @@ public interface UserRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+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(userName).toPropertyWhenPresent("userName", record::getUserName) .map(username).toPropertyWhenPresent("username", record::getUsername)
.map(password).toPropertyWhenPresent("password", record::getPassword) .map(password).toPropertyWhenPresent("password", record::getPassword)
.map(email).toPropertyWhenPresent("email", record::getEmail) .map(email).toPropertyWhenPresent("email", record::getEmail)
.map(locale).toPropertyWhenPresent("locale", record::getLocale) .map(locale).toPropertyWhenPresent("locale", record::getLocale)
@ -134,34 +134,34 @@ public interface UserRecordMapper {
.render(RenderingStrategy.MYBATIS3)); .render(RenderingStrategy.MYBATIS3));
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+01:00", comments="Source Table: user")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectByExample() {
return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, userName, password, email, locale, timezone, active) return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, locale, timezone, active)
.from(userRecord); .from(userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+01:00", comments="Source Table: user")
default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectDistinctByExample() { default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectDistinctByExample() {
return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, userName, password, email, locale, timezone, active) return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, locale, timezone, active)
.from(userRecord); .from(userRecord);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+01:00", comments="Source Table: user")
default UserRecord selectByPrimaryKey(Long id_) { default UserRecord selectByPrimaryKey(Long id_) {
return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, userName, password, email, locale, timezone, active) return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, username, password, email, locale, 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="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+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(userName).equalTo(record::getUserName) .set(username).equalTo(record::getUsername)
.set(password).equalTo(record::getPassword) .set(password).equalTo(record::getPassword)
.set(email).equalTo(record::getEmail) .set(email).equalTo(record::getEmail)
.set(locale).equalTo(record::getLocale) .set(locale).equalTo(record::getLocale)
@ -169,13 +169,13 @@ public interface UserRecordMapper {
.set(active).equalTo(record::getActive); .set(active).equalTo(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.990+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+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(userName).equalToWhenPresent(record::getUserName) .set(username).equalToWhenPresent(record::getUsername)
.set(password).equalToWhenPresent(record::getPassword) .set(password).equalToWhenPresent(record::getPassword)
.set(email).equalToWhenPresent(record::getEmail) .set(email).equalToWhenPresent(record::getEmail)
.set(locale).equalToWhenPresent(record::getLocale) .set(locale).equalToWhenPresent(record::getLocale)
@ -183,13 +183,13 @@ public interface UserRecordMapper {
.set(active).equalToWhenPresent(record::getActive); .set(active).equalToWhenPresent(record::getActive);
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.991+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+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(userName).equalTo(record::getUserName) .set(username).equalTo(record::getUsername)
.set(password).equalTo(record::getPassword) .set(password).equalTo(record::getPassword)
.set(email).equalTo(record::getEmail) .set(email).equalTo(record::getEmail)
.set(locale).equalTo(record::getLocale) .set(locale).equalTo(record::getLocale)
@ -200,13 +200,13 @@ public interface UserRecordMapper {
.execute(); .execute();
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.991+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.916+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(userName).equalToWhenPresent(record::getUserName) .set(username).equalToWhenPresent(record::getUsername)
.set(password).equalToWhenPresent(record::getPassword) .set(password).equalToWhenPresent(record::getPassword)
.set(email).equalToWhenPresent(record::getEmail) .set(email).equalToWhenPresent(record::getEmail)
.set(locale).equalToWhenPresent(record::getLocale) .set(locale).equalToWhenPresent(record::getLocale)

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

@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ClientConnectionRecord { public class ClientConnectionRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.958+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.877+01:00", comments="Source field: client_connection.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.958+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.877+01:00", comments="Source field: client_connection.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.958+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.877+01:00", comments="Source field: client_connection.status")
private String status; private String status;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.958+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.877+01:00", comments="Source field: client_connection.connection_token")
private String connectionToken; private String connectionToken;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.user_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.878+01:00", comments="Source field: client_connection.user_name")
private String userName; private String userName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.vdi") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.878+01:00", comments="Source field: client_connection.vdi")
private Boolean vdi; private Boolean vdi;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.878+01:00", comments="Source field: client_connection.client_address")
private String clientAddress; private String clientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.878+01:00", comments="Source field: client_connection.virtual_client_address")
private String virtualClientAddress; private String virtualClientAddress;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.958+01:00", comments="Source Table: client_connection") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.876+01:00", comments="Source Table: client_connection")
public ClientConnectionRecord(Long id, Long examId, String status, String connectionToken, String userName, Boolean vdi, String clientAddress, String virtualClientAddress) { public ClientConnectionRecord(Long id, Long examId, String status, String connectionToken, String userName, Boolean vdi, String clientAddress, String virtualClientAddress) {
this.id = id; this.id = id;
this.examId = examId; this.examId = examId;
@ -39,42 +39,42 @@ public class ClientConnectionRecord {
this.virtualClientAddress = virtualClientAddress; this.virtualClientAddress = virtualClientAddress;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.958+01:00", comments="Source field: client_connection.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.877+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="2018-12-19T13:27:34.958+01:00", comments="Source field: client_connection.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.877+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="2018-12-19T13:27:34.958+01:00", comments="Source field: client_connection.status") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.877+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="2018-12-19T13:27:34.958+01:00", comments="Source field: client_connection.connection_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.877+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="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.user_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.878+01:00", comments="Source field: client_connection.user_name")
public String getUserName() { public String getUserName() {
return userName; return userName;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.vdi") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.878+01:00", comments="Source field: client_connection.vdi")
public Boolean getVdi() { public Boolean getVdi() {
return vdi; return vdi;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.878+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="2018-12-19T13:27:34.959+01:00", comments="Source field: client_connection.virtual_client_address") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.878+01:00", comments="Source field: client_connection.virtual_client_address")
public String getVirtualClientAddress() { public String getVirtualClientAddress() {
return virtualClientAddress; return virtualClientAddress;
} }
@ -83,7 +83,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -107,7 +107,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -135,7 +135,7 @@ public class ClientConnectionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_connection * This method corresponds to the database table client_connection
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -4,28 +4,28 @@ import java.math.BigDecimal;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ClientEventRecord { public class ClientEventRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.962+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.882+01:00", comments="Source field: client_event.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.962+01:00", comments="Source field: client_event.connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.882+01:00", comments="Source field: client_event.connection_id")
private Long connectionId; private Long connectionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.user_identifier") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.882+01:00", comments="Source field: client_event.user_identifier")
private String userIdentifier; private String userIdentifier;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.883+01:00", comments="Source field: client_event.type")
private Integer type; private Integer type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.883+01:00", comments="Source field: client_event.timestamp")
private Long timestamp; private Long timestamp;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.884+01:00", comments="Source field: client_event.numeric_value")
private BigDecimal numericValue; private BigDecimal numericValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.884+01:00", comments="Source field: client_event.text")
private String text; private String text;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.962+01:00", comments="Source Table: client_event") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.882+01:00", comments="Source Table: client_event")
public ClientEventRecord(Long id, Long connectionId, String userIdentifier, Integer type, Long timestamp, BigDecimal numericValue, String text) { public ClientEventRecord(Long id, Long connectionId, String userIdentifier, Integer type, Long timestamp, BigDecimal numericValue, String text) {
this.id = id; this.id = id;
this.connectionId = connectionId; this.connectionId = connectionId;
@ -36,37 +36,37 @@ public class ClientEventRecord {
this.text = text; this.text = text;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.962+01:00", comments="Source field: client_event.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.882+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="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.connection_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.882+01:00", comments="Source field: client_event.connection_id")
public Long getConnectionId() { public Long getConnectionId() {
return connectionId; return connectionId;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.user_identifier") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.883+01:00", comments="Source field: client_event.user_identifier")
public String getUserIdentifier() { public String getUserIdentifier() {
return userIdentifier; return userIdentifier;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.883+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="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.883+01:00", comments="Source field: client_event.timestamp")
public Long getTimestamp() { public Long getTimestamp() {
return timestamp; return timestamp;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.numeric_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.884+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="2018-12-19T13:27:34.963+01:00", comments="Source field: client_event.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.884+01:00", comments="Source field: client_event.text")
public String getText() { public String getText() {
return text; return text;
} }
@ -75,7 +75,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -98,7 +98,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -125,7 +125,7 @@ public class ClientEventRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table client_event * This method corresponds to the database table client_event
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@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="2018-12-19T13:27:34.770+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.566+01:00", comments="Source field: configuration_attribute.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.771+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.567+01:00", comments="Source field: configuration_attribute.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.771+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.567+01:00", comments="Source field: configuration_attribute.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.567+01:00", comments="Source field: configuration_attribute.parent_id")
private Long parentId; private Long parentId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.567+01:00", comments="Source field: configuration_attribute.resources")
private String resources; private String resources;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.568+01:00", comments="Source field: configuration_attribute.validator")
private String validator; private String validator;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.568+01:00", comments="Source field: configuration_attribute.dependencies")
private String dependencies; private String dependencies;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.568+01:00", comments="Source field: configuration_attribute.default_value")
private String defaultValue; private String defaultValue;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.765+01:00", comments="Source Table: configuration_attribute") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.561+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="2018-12-19T13:27:34.771+01:00", comments="Source field: configuration_attribute.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.567+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="2018-12-19T13:27:34.771+01:00", comments="Source field: configuration_attribute.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.567+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="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.567+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="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.parent_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.567+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="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.resources") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.567+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="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.validator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.568+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="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.dependencies") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.568+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="2018-12-19T13:27:34.772+01:00", comments="Source field: configuration_attribute.default_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.568+01:00", comments="Source field: configuration_attribute.default_value")
public String getDefaultValue() { public String getDefaultValue() {
return defaultValue; return defaultValue;
} }
@ -83,7 +83,7 @@ public class ConfigurationAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_attribute * This method corresponds to the database table configuration_attribute
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -107,7 +107,7 @@ public class ConfigurationAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_attribute * This method corresponds to the database table configuration_attribute
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -135,7 +135,7 @@ public class ConfigurationAttributeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_attribute * This method corresponds to the database table configuration_attribute
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@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="2018-12-19T13:27:34.944+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.834+01:00", comments="Source field: configuration_node.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.945+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.834+01:00", comments="Source field: configuration_node.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+01:00", comments="Source field: configuration_node.owner")
private String owner; private String owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+01:00", comments="Source field: configuration_node.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+01:00", comments="Source field: configuration_node.description")
private String description; private String description;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+01:00", comments="Source field: configuration_node.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+01:00", comments="Source field: configuration_node.template")
private String template; private String template;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+01:00", comments="Source field: configuration_node.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.944+01:00", comments="Source Table: configuration_node") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.834+01:00", comments="Source Table: configuration_node")
public ConfigurationNodeRecord(Long id, Long institutionId, String owner, String name, String description, String type, String template, Integer active) { public ConfigurationNodeRecord(Long id, Long institutionId, String owner, String name, String description, String type, String template, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -39,42 +39,42 @@ public class ConfigurationNodeRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.944+01:00", comments="Source field: configuration_node.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.834+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="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+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="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+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="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+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="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.description") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+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="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+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="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.835+01:00", comments="Source field: configuration_node.template")
public String getTemplate() { public String getTemplate() {
return template; return template;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.946+01:00", comments="Source field: configuration_node.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.836+01:00", comments="Source field: configuration_node.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -83,7 +83,7 @@ public class ConfigurationNodeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_node * This method corresponds to the database table configuration_node
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -107,7 +107,7 @@ public class ConfigurationNodeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_node * This method corresponds to the database table configuration_node
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -135,7 +135,7 @@ public class ConfigurationNodeRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_node * This method corresponds to the database table configuration_node
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -4,22 +4,22 @@ import javax.annotation.Generated;
import org.joda.time.DateTime; import org.joda.time.DateTime;
public class ConfigurationRecord { public class ConfigurationRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.940+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.825+01:00", comments="Source field: configuration.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.940+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.825+01:00", comments="Source field: configuration.configuration_node_id")
private Long configurationNodeId; private Long configurationNodeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.941+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.825+01:00", comments="Source field: configuration.version")
private String version; private String version;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.941+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.825+01:00", comments="Source field: configuration.version_date")
private DateTime versionDate; private DateTime versionDate;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.941+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.825+01:00", comments="Source field: configuration.followup")
private Integer followup; private Integer followup;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.939+01:00", comments="Source Table: configuration") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.824+01:00", comments="Source Table: configuration")
public ConfigurationRecord(Long id, Long configurationNodeId, String version, DateTime versionDate, Integer followup) { public ConfigurationRecord(Long id, Long configurationNodeId, String version, DateTime versionDate, Integer followup) {
this.id = id; this.id = id;
this.configurationNodeId = configurationNodeId; this.configurationNodeId = configurationNodeId;
@ -28,27 +28,27 @@ public class ConfigurationRecord {
this.followup = followup; this.followup = followup;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.940+01:00", comments="Source field: configuration.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.825+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="2018-12-19T13:27:34.940+01:00", comments="Source field: configuration.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.825+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="2018-12-19T13:27:34.941+01:00", comments="Source field: configuration.version") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.825+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="2018-12-19T13:27:34.941+01:00", comments="Source field: configuration.version_date") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.825+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="2018-12-19T13:27:34.941+01:00", comments="Source field: configuration.followup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.825+01:00", comments="Source field: configuration.followup")
public Integer getFollowup() { public Integer getFollowup() {
return followup; return followup;
} }
@ -57,7 +57,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -78,7 +78,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -103,7 +103,7 @@ public class ConfigurationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration * This method corresponds to the database table configuration
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@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="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+01:00", comments="Source field: configuration_value.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+01:00", comments="Source field: configuration_value.configuration_id")
private Long configurationId; private Long configurationId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+01:00", comments="Source field: configuration_value.configuration_attribute_id")
private Long configurationAttributeId; private Long configurationAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+01:00", comments="Source field: configuration_value.list_index")
private Integer listIndex; private Integer listIndex;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+01:00", comments="Source field: configuration_value.value")
private String value; private String value;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+01:00", comments="Source field: configuration_value.text")
private String text; private String text;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.930+01:00", comments="Source Table: configuration_value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.809+01:00", comments="Source Table: configuration_value")
public ConfigurationValueRecord(Long id, Long configurationId, Long configurationAttributeId, Integer listIndex, String value, String text) { public ConfigurationValueRecord(Long id, Long configurationId, Long configurationAttributeId, Integer listIndex, String value, String text) {
this.id = id; this.id = id;
this.configurationId = configurationId; this.configurationId = configurationId;
@ -31,32 +31,32 @@ public class ConfigurationValueRecord {
this.text = text; this.text = text;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+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="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.configuration_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+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="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.configuration_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+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="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.list_index") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+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="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.value") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+01:00", comments="Source field: configuration_value.value")
public String getValue() { public String getValue() {
return value; return value;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.930+01:00", comments="Source field: configuration_value.text") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.810+01:00", comments="Source field: configuration_value.text")
public String getText() { public String getText() {
return text; return text;
} }
@ -65,7 +65,7 @@ public class ConfigurationValueRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_value * This method corresponds to the database table configuration_value
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -87,7 +87,7 @@ public class ConfigurationValueRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_value * This method corresponds to the database table configuration_value
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -113,7 +113,7 @@ public class ConfigurationValueRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table configuration_value * This method corresponds to the database table configuration_value
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,19 +3,19 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class ExamConfigurationMapRecord { public class ExamConfigurationMapRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.949+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.842+01:00", comments="Source field: exam_configuration_map.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.950+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.842+01:00", comments="Source field: exam_configuration_map.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.950+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.842+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="2018-12-19T13:27:34.950+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.842+01:00", comments="Source field: exam_configuration_map.user_names")
private String userNames; private String userNames;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.949+01:00", comments="Source Table: exam_configuration_map") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.842+01:00", comments="Source Table: exam_configuration_map")
public ExamConfigurationMapRecord(Long id, Long examId, Long configurationNodeId, String userNames) { public ExamConfigurationMapRecord(Long id, Long examId, Long configurationNodeId, String userNames) {
this.id = id; this.id = id;
this.examId = examId; this.examId = examId;
@ -23,22 +23,22 @@ public class ExamConfigurationMapRecord {
this.userNames = userNames; this.userNames = userNames;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.949+01:00", comments="Source field: exam_configuration_map.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.842+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="2018-12-19T13:27:34.950+01:00", comments="Source field: exam_configuration_map.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.842+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="2018-12-19T13:27:34.950+01:00", comments="Source field: exam_configuration_map.configuration_node_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.842+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="2018-12-19T13:27:34.950+01:00", comments="Source field: exam_configuration_map.user_names") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.842+01:00", comments="Source field: exam_configuration_map.user_names")
public String getUserNames() { public String getUserNames() {
return userNames; return userNames;
} }
@ -47,7 +47,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -67,7 +67,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -91,7 +91,7 @@ public class ExamConfigurationMapRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam_configuration_map * This method corresponds to the database table exam_configuration_map
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

40
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.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 ExamRecord { public class ExamRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.952+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.846+01:00", comments="Source field: exam.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.952+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.848+01:00", comments="Source field: exam.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.952+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.848+01:00", comments="Source field: exam.lms_setup_id")
private Long lmsSetupId; private Long lmsSetupId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.953+01:00", comments="Source field: exam.external_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.850+01:00", comments="Source field: exam.external_uuid")
private String externalUuid; private String externalUuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.953+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.850+01:00", comments="Source field: exam.owner")
private String owner; private String owner;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.953+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.850+01:00", comments="Source field: exam.supporter")
private String supporter; private String supporter;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.953+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.850+01:00", comments="Source field: exam.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.953+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.850+01:00", comments="Source field: exam.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.952+01:00", comments="Source Table: exam") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.846+01:00", comments="Source Table: exam")
public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalUuid, String owner, String supporter, String type, Integer active) { public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalUuid, String owner, String supporter, String type, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -39,42 +39,42 @@ public class ExamRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.952+01:00", comments="Source field: exam.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.848+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="2018-12-19T13:27:34.952+01:00", comments="Source field: exam.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.848+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="2018-12-19T13:27:34.952+01:00", comments="Source field: exam.lms_setup_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.850+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="2018-12-19T13:27:34.953+01:00", comments="Source field: exam.external_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.850+01:00", comments="Source field: exam.external_uuid")
public String getExternalUuid() { public String getExternalUuid() {
return externalUuid; return externalUuid;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.953+01:00", comments="Source field: exam.owner") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.850+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="2018-12-19T13:27:34.953+01:00", comments="Source field: exam.supporter") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.850+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="2018-12-19T13:27:34.953+01:00", comments="Source field: exam.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.850+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="2018-12-19T13:27:34.953+01:00", comments="Source field: exam.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.852+01:00", comments="Source field: exam.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -83,7 +83,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -107,7 +107,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -135,7 +135,7 @@ public class ExamRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table exam * This method corresponds to the database table exam
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@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="2018-12-19T13:27:34.966+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.889+01:00", comments="Source field: indicator.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.966+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+01:00", comments="Source field: indicator.exam_id")
private Long examId; private Long examId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.966+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+01:00", comments="Source field: indicator.type")
private String type; private String type;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.966+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+01:00", comments="Source field: indicator.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.966+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+01:00", comments="Source field: indicator.color")
private String color; private String color;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.966+01:00", comments="Source Table: indicator") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.889+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="2018-12-19T13:27:34.966+01:00", comments="Source field: indicator.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.889+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="2018-12-19T13:27:34.966+01:00", comments="Source field: indicator.exam_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+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="2018-12-19T13:27:34.966+01:00", comments="Source field: indicator.type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+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="2018-12-19T13:27:34.966+01:00", comments="Source field: indicator.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+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="2018-12-19T13:27:34.966+01:00", comments="Source field: indicator.color") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.890+01:00", comments="Source field: indicator.color")
public String getColor() { public String getColor() {
return color; return color;
} }
@ -56,7 +56,7 @@ public class IndicatorRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table indicator * This method corresponds to the database table indicator
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class IndicatorRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table indicator * This method corresponds to the database table indicator
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class IndicatorRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table indicator * This method corresponds to the database table indicator
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class InstitutionRecord { public class InstitutionRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.969+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.893+01:00", comments="Source field: institution.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.969+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.893+01:00", comments="Source field: institution.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.969+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.893+01:00", comments="Source field: institution.url_suffix")
private String urlSuffix; private String urlSuffix;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.969+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.894+01:00", comments="Source field: institution.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.969+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.894+01:00", comments="Source field: institution.logo_image")
private String logoImage; private String logoImage;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.969+01:00", comments="Source Table: institution") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.893+01:00", comments="Source Table: institution")
public InstitutionRecord(Long id, String name, String urlSuffix, Integer active, String logoImage) { public InstitutionRecord(Long id, String name, String urlSuffix, Integer active, String logoImage) {
this.id = id; this.id = id;
this.name = name; this.name = name;
@ -27,27 +27,27 @@ public class InstitutionRecord {
this.logoImage = logoImage; this.logoImage = logoImage;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.969+01:00", comments="Source field: institution.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.893+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="2018-12-19T13:27:34.969+01:00", comments="Source field: institution.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.893+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="2018-12-19T13:27:34.969+01:00", comments="Source field: institution.url_suffix") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.894+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="2018-12-19T13:27:34.969+01:00", comments="Source field: institution.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.894+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="2018-12-19T13:27:34.969+01:00", comments="Source field: institution.logo_image") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.894+01:00", comments="Source field: institution.logo_image")
public String getLogoImage() { public String getLogoImage() {
return logoImage; return logoImage;
} }
@ -56,7 +56,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -77,7 +77,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -102,7 +102,7 @@ public class InstitutionRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table institution * This method corresponds to the database table institution
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,40 +3,40 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class LmsSetupRecord { public class LmsSetupRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.972+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.897+01:00", comments="Source field: lms_setup.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.972+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.897+01:00", comments="Source field: lms_setup.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.972+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.897+01:00", comments="Source field: lms_setup.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+01:00", comments="Source field: lms_setup.lms_type")
private String lmsType; private String lmsType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+01:00", comments="Source field: lms_setup.lms_url")
private String lmsUrl; private String lmsUrl;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+01:00", comments="Source field: lms_setup.lms_clientname")
private String lmsClientname; private String lmsClientname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+01:00", comments="Source field: lms_setup.lms_clientsecret")
private String lmsClientsecret; private String lmsClientsecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+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="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.seb_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+01:00", comments="Source field: lms_setup.seb_clientname")
private String sebClientname; private String sebClientname;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.seb_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+01:00", comments="Source field: lms_setup.seb_clientsecret")
private String sebClientsecret; private String sebClientsecret;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+01:00", comments="Source field: lms_setup.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.972+01:00", comments="Source Table: lms_setup") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.897+01:00", comments="Source Table: lms_setup")
public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String sebClientname, String sebClientsecret, Integer active) { public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String sebClientname, String sebClientsecret, Integer active) {
this.id = id; this.id = id;
this.institutionId = institutionId; this.institutionId = institutionId;
@ -51,57 +51,57 @@ public class LmsSetupRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.972+01:00", comments="Source field: lms_setup.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.897+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="2018-12-19T13:27:34.972+01:00", comments="Source field: lms_setup.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.897+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="2018-12-19T13:27:34.972+01:00", comments="Source field: lms_setup.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.897+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="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.lms_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+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="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.lms_url") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+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="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.lms_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+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="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.lms_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+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="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.lms_rest_api_token") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+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="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.seb_clientname") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+01:00", comments="Source field: lms_setup.seb_clientname")
public String getSebClientname() { public String getSebClientname() {
return sebClientname; return sebClientname;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.seb_clientsecret") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+01:00", comments="Source field: lms_setup.seb_clientsecret")
public String getSebClientsecret() { public String getSebClientsecret() {
return sebClientsecret; return sebClientsecret;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.973+01:00", comments="Source field: lms_setup.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.898+01:00", comments="Source field: lms_setup.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -110,7 +110,7 @@ public class LmsSetupRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table lms_setup * This method corresponds to the database table lms_setup
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -137,7 +137,7 @@ public class LmsSetupRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table lms_setup * This method corresponds to the database table lms_setup
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -168,7 +168,7 @@ public class LmsSetupRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table lms_setup * This method corresponds to the database table lms_setup
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
import javax.annotation.Generated; import javax.annotation.Generated;
public class OrientationRecord { public class OrientationRecord {
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.934+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.815+01:00", comments="Source field: orientation.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.934+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+01:00", comments="Source field: orientation.config_attribute_id")
private Long configAttributeId; private Long configAttributeId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+01:00", comments="Source field: orientation.template")
private String template; private String template;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+01:00", comments="Source field: orientation.view")
private String view; private String view;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.group") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+01:00", comments="Source field: orientation.group")
private String group; private String group;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+01:00", comments="Source field: orientation.x_position")
private Integer xPosition; private Integer xPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+01:00", comments="Source field: orientation.y_position")
private Integer yPosition; private Integer yPosition;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+01:00", comments="Source field: orientation.width")
private Integer width; private Integer width;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.817+01:00", comments="Source field: orientation.height")
private Integer height; private Integer height;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.934+01:00", comments="Source Table: orientation") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.815+01:00", comments="Source Table: orientation")
public OrientationRecord(Long id, Long configAttributeId, String template, String view, String group, Integer xPosition, Integer yPosition, Integer width, Integer height) { public OrientationRecord(Long id, Long configAttributeId, String template, String view, String group, Integer xPosition, Integer yPosition, Integer width, Integer height) {
this.id = id; this.id = id;
this.configAttributeId = configAttributeId; this.configAttributeId = configAttributeId;
@ -43,47 +43,47 @@ public class OrientationRecord {
this.height = height; this.height = height;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.934+01:00", comments="Source field: orientation.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.815+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="2018-12-19T13:27:34.934+01:00", comments="Source field: orientation.config_attribute_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+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="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.template") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+01:00", comments="Source field: orientation.template")
public String getTemplate() { public String getTemplate() {
return template; return template;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.view") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+01:00", comments="Source field: orientation.view")
public String getView() { public String getView() {
return view; return view;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.group") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+01:00", comments="Source field: orientation.group")
public String getGroup() { public String getGroup() {
return group; return group;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.x_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+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="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.y_position") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.816+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="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.width") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.817+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="2018-12-19T13:27:34.935+01:00", comments="Source field: orientation.height") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.817+01:00", comments="Source field: orientation.height")
public Integer getHeight() { public Integer getHeight() {
return height; return height;
} }
@ -92,7 +92,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -117,7 +117,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -146,7 +146,7 @@ public class OrientationRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table orientation * This method corresponds to the database table orientation
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@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="2018-12-19T13:27:34.991+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.917+01:00", comments="Source field: user_role.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.991+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.917+01:00", comments="Source field: user_role.user_id")
private Long userId; private Long userId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.991+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.917+01:00", comments="Source field: user_role.role_name")
private String roleName; private String roleName;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.991+01:00", comments="Source Table: user_role") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.917+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="2018-12-19T13:27:34.991+01:00", comments="Source field: user_role.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.917+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="2018-12-19T13:27:34.991+01:00", comments="Source field: user_role.user_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.917+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="2018-12-19T13:27:34.991+01:00", comments="Source field: user_role.role_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.917+01:00", comments="Source field: user_role.role_name")
public String getRoleName() { public String getRoleName() {
return roleName; return roleName;
} }
@ -38,7 +38,7 @@ public class RoleRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_role * This method corresponds to the database table user_role
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -57,7 +57,7 @@ public class RoleRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_role * This method corresponds to the database table user_role
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -80,7 +80,7 @@ public class RoleRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_role * This method corresponds to the database table user_role
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@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="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.920+01:00", comments="Source field: user_activity_log.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.920+01:00", comments="Source field: user_activity_log.user_uuid")
private String userUuid; private String userUuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+01:00", comments="Source field: user_activity_log.timestamp")
private Long timestamp; private Long timestamp;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+01:00", comments="Source field: user_activity_log.activity_type")
private String activityType; private String activityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+01:00", comments="Source field: user_activity_log.entity_type")
private String entityType; private String entityType;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+01:00", comments="Source field: user_activity_log.entity_id")
private String entityId; private String entityId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+01:00", comments="Source field: user_activity_log.message")
private String message; private String message;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.993+01:00", comments="Source Table: user_activity_log") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.920+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="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.920+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="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.user_uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+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="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.timestamp") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+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="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.activity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+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="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.entity_type") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+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="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.entity_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+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="2018-12-19T13:27:34.993+01:00", comments="Source field: user_activity_log.message") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.921+01:00", comments="Source field: user_activity_log.message")
public String getMessage() { public String getMessage() {
return message; return message;
} }
@ -74,7 +74,7 @@ public class UserActivityLogRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_activity_log * This method corresponds to the database table user_activity_log
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -97,7 +97,7 @@ public class UserActivityLogRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_activity_log * This method corresponds to the database table user_activity_log
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -124,7 +124,7 @@ public class UserActivityLogRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user_activity_log * This method corresponds to the database table user_activity_log
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public int hashCode() { public int hashCode() {

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

@ -3,43 +3,43 @@ 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="2018-12-19T13:27:34.986+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.id")
private Long id; private Long id;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.986+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.institution_id")
private Long institutionId; private Long institutionId;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.986+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.uuid")
private String uuid; private String uuid;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.986+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.name")
private String name; private String name;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.986+01:00", comments="Source field: user.user_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.username")
private String userName; private String username;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.987+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.password")
private String password; private String password;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.987+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.email")
private String email; private String email;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.987+01:00", comments="Source field: user.locale") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.locale")
private String locale; private String locale;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.987+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.timezone")
private String timezone; private String timezone;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.987+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.active")
private Integer active; private Integer active;
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.986+01:00", comments="Source Table: user") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.912+01:00", comments="Source Table: user")
public UserRecord(Long id, Long institutionId, String uuid, String name, String userName, String password, String email, String locale, String timezone, Integer active) { public UserRecord(Long id, Long institutionId, String uuid, String name, String username, String password, String email, String locale, 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.userName = userName; this.username = username;
this.password = password; this.password = password;
this.email = email; this.email = email;
this.locale = locale; this.locale = locale;
@ -47,52 +47,52 @@ public class UserRecord {
this.active = active; this.active = active;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.986+01:00", comments="Source field: user.id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+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="2018-12-19T13:27:34.986+01:00", comments="Source field: user.institution_id") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+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="2018-12-19T13:27:34.986+01:00", comments="Source field: user.uuid") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+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="2018-12-19T13:27:34.986+01:00", comments="Source field: user.name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+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="2018-12-19T13:27:34.986+01:00", comments="Source field: user.user_name") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+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="2018-12-19T13:27:34.987+01:00", comments="Source field: user.password") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+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="2018-12-19T13:27:34.987+01:00", comments="Source field: user.email") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+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="2018-12-19T13:27:34.987+01:00", comments="Source field: user.locale") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.locale")
public String getLocale() { public String getLocale() {
return locale; return locale;
} }
@Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-19T13:27:34.987+01:00", comments="Source field: user.timezone") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+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="2018-12-19T13:27:34.987+01:00", comments="Source field: user.active") @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-12-20T15:08:14.913+01:00", comments="Source field: user.active")
public Integer getActive() { public Integer getActive() {
return active; return active;
} }
@ -101,7 +101,7 @@ public class UserRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user * This method corresponds to the database table user
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public String toString() { public String toString() {
@ -113,7 +113,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(", userName=").append(userName); sb.append(", username=").append(username);
sb.append(", password=").append(password); sb.append(", password=").append(password);
sb.append(", email=").append(email); sb.append(", email=").append(email);
sb.append(", locale=").append(locale); sb.append(", locale=").append(locale);
@ -127,7 +127,7 @@ public class UserRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user * This method corresponds to the database table user
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
@ -145,7 +145,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.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName())) && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername()))
&& (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword())) && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
&& (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail())) && (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail()))
&& (this.getLocale() == null ? other.getLocale() == null : this.getLocale().equals(other.getLocale())) && (this.getLocale() == null ? other.getLocale() == null : this.getLocale().equals(other.getLocale()))
@ -157,7 +157,7 @@ public class UserRecord {
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table user * This method corresponds to the database table user
* *
* @mbg.generated Wed Dec 19 13:27:34 CET 2018 * @mbg.generated Thu Dec 20 15:08:14 CET 2018
*/ */
@Override @Override
public int hashCode() { public int hashCode() {
@ -167,7 +167,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 + ((getUserName() == null) ? 0 : getUserName().hashCode()); result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode()); result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode()); result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode());
result = prime * result + ((getLocale() == null) ? 0 : getLocale().hashCode()); result = prime * result + ((getLocale() == null) ? 0 : getLocale().hashCode());

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

@ -69,7 +69,7 @@ public final class SEBServerUser implements UserDetails, CredentialsContainer {
@Override @Override
public String getUsername() { public String getUsername() {
return this.userInfo.userName; return this.userInfo.username;
} }
@Override @Override

3
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/EntityDAO.java
View file

@ -11,6 +11,7 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.dao;
import java.util.Collection; import java.util.Collection;
import java.util.function.Predicate; import java.util.function.Predicate;
import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport;
import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.Entity;
import ch.ethz.seb.sebserver.gbl.model.EntityType; import ch.ethz.seb.sebserver.gbl.model.EntityType;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
@ -68,7 +69,7 @@ public interface EntityDAO<T extends Entity> {
* hard deleted * hard deleted
* @return Result of a collection of all entities that has been deleted (or archived) or refer to an error if * @return Result of a collection of all entities that has been deleted (or archived) or refer to an error if
* happened */ * happened */
Result<DeletionReport> delete(Long id, boolean archive); Result<EntityProcessingReport> delete(Long id, boolean archive);
/** Utility method to extract an expected single resource entry form a Collection of specified type. /** Utility method to extract an expected single resource entry form a Collection of specified type.
* Gets a Result refer to an expected single resource entry form a Collection of specified type or refer * Gets a Result refer to an expected single resource entry form a Collection of specified type or refer

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

@ -15,7 +15,7 @@ import ch.ethz.seb.sebserver.gbl.util.Result;
public interface InstitutionDAO extends EntityDAO<Institution>, ActivatableEntityDAO<Institution> { public interface InstitutionDAO extends EntityDAO<Institution>, ActivatableEntityDAO<Institution> {
Result<Collection<Institution>> allMatching(String name, boolean active); Result<Collection<Institution>> allMatching(String name, Boolean active);
Result<Institution> save(Institution institution); Result<Institution> save(Institution institution);

14
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/UserDAO.java
View file

@ -10,6 +10,7 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.dao;
import java.util.Collection; import java.util.Collection;
import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport;
import ch.ethz.seb.sebserver.gbl.model.user.UserFilter; import ch.ethz.seb.sebserver.gbl.model.user.UserFilter;
import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
import ch.ethz.seb.sebserver.gbl.model.user.UserMod; import ch.ethz.seb.sebserver.gbl.model.user.UserMod;
@ -27,6 +28,12 @@ public interface UserDAO extends EntityDAO<UserInfo>, ActivatableEntityDAO<UserI
* @return a Result of UserInfo data from user with the specified UUID. Or an exception result on error case */ * @return a Result of UserInfo data from user with the specified UUID. Or an exception result on error case */
Result<UserInfo> byUuid(String uuid); Result<UserInfo> byUuid(String uuid);
/** Use this to get the user id (PK) from a given UUID.
*
* @param uuid The UUID of the user
* @return the user id (PK) from a given UUID. */
Result<Long> pkForUUID(String uuid);
/** Use this to get UserInfo by users username /** Use this to get UserInfo by users username
* *
* @param username The username of the user to get UserInfo from * @param username The username of the user to get UserInfo from
@ -57,4 +64,11 @@ public interface UserDAO extends EntityDAO<UserInfo>, ActivatableEntityDAO<UserI
* exception on error case */ * exception on error case */
Result<UserInfo> save(UserMod userMod); Result<UserInfo> save(UserMod userMod);
/** Use this to get an EntityProcessingReport containing the user account entity itself
* and all user related data entities.
*
* @param uuid The UUID of the user
* @return an EntityProcessingReport containing all user related entity data */
Result<EntityProcessingReport> getAllUserData(String uuid);
} }

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

@ -23,15 +23,16 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport;
import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.Entity;
import ch.ethz.seb.sebserver.gbl.model.EntityType; import ch.ethz.seb.sebserver.gbl.model.EntityType;
import ch.ethz.seb.sebserver.gbl.model.institution.Institution; import ch.ethz.seb.sebserver.gbl.model.institution.Institution;
import ch.ethz.seb.sebserver.gbl.util.Result; import ch.ethz.seb.sebserver.gbl.util.Result;
import ch.ethz.seb.sebserver.gbl.util.Utils;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.InstitutionRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.InstitutionRecordDynamicSqlSupport;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.InstitutionRecordMapper; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.InstitutionRecordMapper;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.UserRecordDynamicSqlSupport; import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.UserRecordDynamicSqlSupport;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.InstitutionRecord; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.InstitutionRecord;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.DeletionReport;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.InstitutionDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.InstitutionDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ResourceNotFoundException; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ResourceNotFoundException;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.TransactionHandler; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.TransactionHandler;
@ -87,12 +88,15 @@ public class InstitutionDAOImpl implements InstitutionDAO {
@Override @Override
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Result<Collection<Institution>> allMatching(final String name, final boolean active) { public Result<Collection<Institution>> allMatching(final String name, final Boolean active) {
return Result.tryCatch(() -> this.institutionRecordMapper return Result.tryCatch(() -> this.institutionRecordMapper
.selectByExample() .selectByExample()
.where(InstitutionRecordDynamicSqlSupport.active, .where(
SqlBuilder.isEqualTo(BooleanUtils.toInteger(active))) InstitutionRecordDynamicSqlSupport.active,
.and(InstitutionRecordDynamicSqlSupport.name, SqlBuilder.isEqualToWhenPresent(name)) SqlBuilder.isEqualTo(BooleanUtils.toInteger(BooleanUtils.isNotFalse(active))))
.and(
InstitutionRecordDynamicSqlSupport.name,
SqlBuilder.isEqualToWhenPresent(Utils.toSQLWildcard(name)))
.build() .build()
.execute() .execute()
.stream() .stream()
@ -142,7 +146,7 @@ public class InstitutionDAOImpl implements InstitutionDAO {
@Override @Override
@Transactional @Transactional
public Result<DeletionReport> delete(final Long id, final boolean archive) { public Result<EntityProcessingReport> delete(final Long id, final boolean archive) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }

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

@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionInterceptor; import org.springframework.transaction.interceptor.TransactionInterceptor;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport;
import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.Entity;
import ch.ethz.seb.sebserver.gbl.model.EntityType; import ch.ethz.seb.sebserver.gbl.model.EntityType;
import ch.ethz.seb.sebserver.gbl.model.user.UserActivityLog; import ch.ethz.seb.sebserver.gbl.model.user.UserActivityLog;
@ -34,7 +35,6 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.Authorization
import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.PrivilegeType; import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.PrivilegeType;
import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.SEBServerUser; import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.SEBServerUser;
import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.UserService; import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.UserService;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.DeletionReport;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.TransactionHandler; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.TransactionHandler;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO;
@ -124,9 +124,9 @@ public class UserActivityLogDAOImpl implements UserActivityLogDAO {
@Override @Override
@Transactional @Transactional
public Result<DeletionReport> delete(final Long id, final boolean archive) { public Result<EntityProcessingReport> delete(final Long id, final boolean archive) {
return Result.tryCatch(() -> { return Result.tryCatch(() -> {
final DeletionReport report = new DeletionReport(); final EntityProcessingReport report = new EntityProcessingReport();
final UserActivityLog log = byId(id).getOrThrow(); final UserActivityLog log = byId(id).getOrThrow();
this.userLogRecordMapper.deleteByPrimaryKey(id); this.userLogRecordMapper.deleteByPrimaryKey(id);

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

@ -8,6 +8,7 @@
package ch.ethz.seb.sebserver.webservice.servicelayer.dao.impl; package ch.ethz.seb.sebserver.webservice.servicelayer.dao.impl;
import static ch.ethz.seb.sebserver.gbl.util.Utils.toSQLWildcard;
import static org.mybatis.dynamic.sql.SqlBuilder.*; import static org.mybatis.dynamic.sql.SqlBuilder.*;
import java.util.Collection; import java.util.Collection;
@ -37,6 +38,7 @@ import ch.ethz.seb.sebserver.WebSecurityConfig;
import ch.ethz.seb.sebserver.gbl.model.APIMessage.APIMessageException; import ch.ethz.seb.sebserver.gbl.model.APIMessage.APIMessageException;
import ch.ethz.seb.sebserver.gbl.model.APIMessage.ErrorMessage; import ch.ethz.seb.sebserver.gbl.model.APIMessage.ErrorMessage;
import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.Entity;
import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport;
import ch.ethz.seb.sebserver.gbl.model.EntityType; import ch.ethz.seb.sebserver.gbl.model.EntityType;
import ch.ethz.seb.sebserver.gbl.model.user.UserFilter; import ch.ethz.seb.sebserver.gbl.model.user.UserFilter;
import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
@ -49,7 +51,6 @@ import ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.UserRecordMapper;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.RoleRecord; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.RoleRecord;
import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.UserRecord; import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.UserRecord;
import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.SEBServerUser; import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.SEBServerUser;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.DeletionReport;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.TransactionHandler; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.TransactionHandler;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserDAO; import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserDAO;
@ -92,6 +93,13 @@ public class UserDaoImpl implements UserDAO {
.flatMap(this::toDomainModel); .flatMap(this::toDomainModel);
} }
@Override
@Transactional(readOnly = true)
public Result<Long> pkForUUID(final String uuid) {
return recordByUUID(uuid)
.map(r -> r.getId());
}
@Override @Override
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Result<UserInfo> byUsername(final String username) { public Result<UserInfo> byUsername(final String username) {
@ -138,11 +146,11 @@ public class UserDaoImpl implements UserDAO {
public Result<Collection<UserInfo>> all(final UserFilter filter) { public Result<Collection<UserInfo>> all(final UserFilter filter) {
return Result.tryCatch(() -> this.userRecordMapper.selectByExample().where( return Result.tryCatch(() -> this.userRecordMapper.selectByExample().where(
UserRecordDynamicSqlSupport.active, UserRecordDynamicSqlSupport.active,
isEqualTo(BooleanUtils.toInteger(filter.active))) isEqualTo(BooleanUtils.toInteger(BooleanUtils.isNotFalse(filter.active))))
.and(UserRecordDynamicSqlSupport.institutionId, isEqualToWhenPresent(filter.institutionId)) .and(UserRecordDynamicSqlSupport.institutionId, isEqualToWhenPresent(filter.institutionId))
.and(UserRecordDynamicSqlSupport.name, isLikeWhenPresent(filter.getNameLike())) .and(UserRecordDynamicSqlSupport.name, isLikeWhenPresent(toSQLWildcard(filter.name)))
.and(UserRecordDynamicSqlSupport.userName, isLikeWhenPresent(filter.getUserNameLike())) .and(UserRecordDynamicSqlSupport.username, isLikeWhenPresent(toSQLWildcard(filter.username)))
.and(UserRecordDynamicSqlSupport.email, isLikeWhenPresent(filter.getEmailLike())) .and(UserRecordDynamicSqlSupport.email, isLikeWhenPresent(toSQLWildcard(filter.email)))
.and(UserRecordDynamicSqlSupport.locale, isLikeWhenPresent(filter.locale)) .and(UserRecordDynamicSqlSupport.locale, isLikeWhenPresent(filter.locale))
.build() .build()
.execute() .execute()
@ -170,13 +178,22 @@ public class UserDaoImpl implements UserDAO {
@Override @Override
@Transactional @Transactional
public Result<DeletionReport> delete(final Long id, final boolean force) { public Result<EntityProcessingReport> delete(final Long id, final boolean force) {
// TODO clarify within discussion about deactivate, archive and delete user related data // TODO clarify within discussion about deactivate, archive and delete user related data
return Result.ofError(new RuntimeException("TODO")); return Result.ofError(new RuntimeException("TODO"));
} }
@Override
@Transactional(readOnly = true)
public Result<EntityProcessingReport> getAllUserData(final String uuid) {
// TODO
return Result.ofError(new RuntimeException("TODO"));
}
@Override @Override
@Transactional @Transactional
public Result<UserInfo> setActive(final String entityId, final boolean active) { public Result<UserInfo> setActive(final String entityId, final boolean active) {
@ -242,7 +259,7 @@ public class UserDaoImpl implements UserDAO {
null, null,
null, null,
userMod.name, userMod.name,
userMod.userName, userMod.username,
(changePWD) ? this.userPasswordEncoder.encode(userMod.getNewPassword()) : null, (changePWD) ? this.userPasswordEncoder.encode(userMod.getNewPassword()) : null,
userMod.email, userMod.email,
userMod.locale.toLanguageTag(), userMod.locale.toLanguageTag(),
@ -267,7 +284,7 @@ public class UserDaoImpl implements UserDAO {
userMod.institutionId, userMod.institutionId,
UUID.randomUUID().toString(), UUID.randomUUID().toString(),
userMod.name, userMod.name,
userMod.userName, userMod.username,
this.userPasswordEncoder.encode(userMod.getNewPassword()), this.userPasswordEncoder.encode(userMod.getNewPassword()),
userMod.email, userMod.email,
userMod.locale.toLanguageTag(), userMod.locale.toLanguageTag(),
@ -303,7 +320,7 @@ public class UserDaoImpl implements UserDAO {
username, username,
this.userRecordMapper this.userRecordMapper
.selectByExample() .selectByExample()
.where(UserRecordDynamicSqlSupport.userName, isEqualTo(username)) .where(UserRecordDynamicSqlSupport.username, isEqualTo(username))
.and(UserRecordDynamicSqlSupport.active, .and(UserRecordDynamicSqlSupport.active,
isEqualToWhenPresent(BooleanUtils.toInteger(true))) isEqualToWhenPresent(BooleanUtils.toInteger(true)))
.build() .build()
@ -345,7 +362,7 @@ public class UserDaoImpl implements UserDAO {
record.getUuid(), record.getUuid(),
record.getInstitutionId(), record.getInstitutionId(),
record.getName(), record.getName(),
record.getUserName(), record.getUsername(),
record.getEmail(), record.getEmail(),
BooleanUtils.toBooleanObject(record.getActive()), BooleanUtils.toBooleanObject(record.getActive()),
Locale.forLanguageTag(record.getLocale()), Locale.forLanguageTag(record.getLocale()),

45
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/InstitutionController.java Normal file
View file

@ -0,0 +1,45 @@
/*
* Copyright (c) 2018 ETH Zürich, Educational Development and Technology (LET)
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package ch.ethz.seb.sebserver.webservice.weblayer.api;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile;
import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.AuthorizationGrantService;
import ch.ethz.seb.sebserver.webservice.servicelayer.authorization.UserService;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.InstitutionDAO;
import ch.ethz.seb.sebserver.webservice.servicelayer.dao.UserActivityLogDAO;
@WebServiceProfile
@RestController
@RequestMapping("/${sebserver.webservice.api.admin.endpoint}" + RestAPI.ENDPOINT_INSTITUTION)
public class InstitutionController {
private final InstitutionDAO institutionDAO;
private final AuthorizationGrantService authorizationGrantService;
private final UserService userService;
private final UserActivityLogDAO userActivityLogDAO;
private final ApplicationEventPublisher applicationEventPublisher;
public InstitutionController(
final InstitutionDAO institutionDAO,
final AuthorizationGrantService authorizationGrantService,
final UserService userService, final UserActivityLogDAO userActivityLogDAO,
final ApplicationEventPublisher applicationEventPublisher) {
this.institutionDAO = institutionDAO;
this.authorizationGrantService = authorizationGrantService;
this.userService = userService;
this.userActivityLogDAO = userActivityLogDAO;
this.applicationEventPublisher = applicationEventPublisher;
}
}

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

@ -10,6 +10,8 @@ package ch.ethz.seb.sebserver.webservice.weblayer.api;
public class RestAPI { public class RestAPI {
public static final String ENDPOINT_INSTITUTION = "/institution";
public static final String ENDPOINT_USER_ACCOUNT = "/useraccount"; public static final String ENDPOINT_USER_ACCOUNT = "/useraccount";
public static final String ENDPOINT_USER_ACTIVITY_LOG = "/useractivity"; public static final String ENDPOINT_USER_ACTIVITY_LOG = "/useractivity";

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

@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import ch.ethz.seb.sebserver.gbl.model.Domain.USER;
import ch.ethz.seb.sebserver.gbl.model.EntityProcessingReport;
import ch.ethz.seb.sebserver.gbl.model.EntityType; import ch.ethz.seb.sebserver.gbl.model.EntityType;
import ch.ethz.seb.sebserver.gbl.model.user.UserFilter; import ch.ethz.seb.sebserver.gbl.model.user.UserFilter;
import ch.ethz.seb.sebserver.gbl.model.user.UserInfo; import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
@ -64,12 +66,12 @@ public class UserAccountController {
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET)
public Collection<UserInfo> getAll( public Collection<UserInfo> getAll(
@RequestParam(required = false) final Long institutionId, @RequestParam(name = USER.ATTR_INSTITUTION_ID, required = false) final Long institutionId,
@RequestParam(required = false) final Boolean active, @RequestParam(name = USER.ATTR_ACTIVE, required = false) final Boolean active,
@RequestParam(required = false) final String name, @RequestParam(name = USER.ATTR_NAME, required = false) final String name,
@RequestParam(required = false) final String userName, @RequestParam(name = USER.ATTR_USERNAME, required = false) final String username,
@RequestParam(required = false) final String email, @RequestParam(name = USER.ATTR_EMAIL, required = false) final String email,
@RequestParam(required = false) final String locale) { @RequestParam(name = USER.ATTR_LOCALE, required = false) final String locale) {
// fist check if current user has any privileges for this action // fist check if current user has any privileges for this action
this.authorizationGrantService.checkHasAnyPrivilege( this.authorizationGrantService.checkHasAnyPrivilege(
@ -77,8 +79,8 @@ public class UserAccountController {
PrivilegeType.READ_ONLY); PrivilegeType.READ_ONLY);
final UserFilter userFilter = (institutionId != null || active != null || name != null || final UserFilter userFilter = (institutionId != null || active != null || name != null ||
userName != null || email != null || locale != null) username != null || email != null || locale != null)
? new UserFilter(institutionId, name, userName, email, active, locale) ? new UserFilter(institutionId, name, username, email, active, locale)
: null; : null;
if (this.authorizationGrantService.hasBasePrivilege( if (this.authorizationGrantService.hasBasePrivilege(
@ -120,10 +122,10 @@ public class UserAccountController {
.getUserInfo(); .getUserInfo();
} }
@RequestMapping(value = "/{userUUID}", method = RequestMethod.GET) @RequestMapping(value = "/{uuid}", method = RequestMethod.GET)
public UserInfo accountInfo(@PathVariable final String userUUID) { public UserInfo accountInfo(@PathVariable final String uuid) {
return this.userDao return this.userDao
.byUuid(userUUID) .byUuid(uuid)
.flatMap(userInfo -> this.authorizationGrantService.checkGrantOnEntity( .flatMap(userInfo -> this.authorizationGrantService.checkGrantOnEntity(
userInfo, userInfo,
PrivilegeType.READ_ONLY)) PrivilegeType.READ_ONLY))
@ -144,18 +146,38 @@ public class UserAccountController {
} }
@RequestMapping(value = "/{userUUID}/activate", method = RequestMethod.POST) @RequestMapping(value = "/{uuid}/activate", method = RequestMethod.POST)
public UserInfo activateUser(@PathVariable final String userUUID) { public UserInfo activateUser(@PathVariable final String uuid) {
return setActivity(userUUID, true); return setActivity(uuid, true);
} }
@RequestMapping(value = "/{userUUID}/deactivate", method = RequestMethod.POST) @RequestMapping(value = "/{uuid}/deactivate", method = RequestMethod.POST)
public UserInfo deactivateUser(@PathVariable final String userUUID) { public UserInfo deactivateUser(@PathVariable final String uuid) {
return setActivity(userUUID, false); return setActivity(uuid, false);
} }
private UserInfo setActivity(final String userUUID, final boolean activity) { @RequestMapping(value = "/{uuid}/delete", method = RequestMethod.DELETE)
return this.userDao.byUuid(userUUID) public EntityProcessingReport deleteUser(@PathVariable final String uuid) {
return this.userDao.pkForUUID(uuid)
.flatMap(pk -> this.userDao.delete(pk, true))
.getOrThrow();
}
@RequestMapping(value = "/{uuid}/hard-delete", method = RequestMethod.DELETE)
public EntityProcessingReport hardDeleteUser(@PathVariable final String uuid) {
return this.userDao.pkForUUID(uuid)
.flatMap(pk -> this.userDao.delete(pk, false))
.getOrThrow();
}
@RequestMapping(value = "/{uuid}/relations", method = RequestMethod.GET)
public EntityProcessingReport getAllUserRelatedData(@PathVariable final String uuid) {
return this.userDao.getAllUserData(uuid)
.getOrThrow();
}
private UserInfo setActivity(final String uuid, final boolean activity) {
return this.userDao.byUuid(uuid)
.flatMap(userInfo -> this.authorizationGrantService.checkGrantOnEntity(userInfo, PrivilegeType.WRITE)) .flatMap(userInfo -> this.authorizationGrantService.checkGrantOnEntity(userInfo, PrivilegeType.WRITE))
.flatMap(userInfo -> this.userDao.setActive(userInfo.uuid, activity)) .flatMap(userInfo -> this.userDao.setActive(userInfo.uuid, activity))
.map(userInfo -> { .map(userInfo -> {
@ -179,7 +201,7 @@ public class UserAccountController {
// handle password change; revoke access tokens if password has changed // handle password change; revoke access tokens if password has changed
if (userData.passwordChangeRequest() && userData.newPasswordMatch()) { if (userData.passwordChangeRequest() && userData.newPasswordMatch()) {
this.applicationEventPublisher.publishEvent( this.applicationEventPublisher.publishEvent(
new RevokeTokenEndpoint.RevokeTokenEvent(this, userInfo.userName)); new RevokeTokenEndpoint.RevokeTokenEvent(this, userInfo.username));
} }
return Result.of(userInfo); return Result.of(userInfo);
}); });

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

@ -301,7 +301,7 @@ CREATE TABLE IF NOT EXISTS `user` (
`institution_id` BIGINT UNSIGNED NULL, `institution_id` BIGINT UNSIGNED NULL,
`uuid` VARCHAR(255) NOT NULL, `uuid` VARCHAR(255) NOT NULL,
`name` VARCHAR(255) NOT NULL, `name` VARCHAR(255) NOT NULL,
`user_name` VARCHAR(255) NOT NULL, `username` VARCHAR(255) NOT NULL,
`password` VARCHAR(255) NOT NULL, `password` VARCHAR(255) NOT NULL,
`email` VARCHAR(255) NOT NULL, `email` VARCHAR(255) NOT NULL,
`locale` VARCHAR(45) NOT NULL, `locale` VARCHAR(45) NOT NULL,

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

@ -50,7 +50,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTest {
"{\"uuid\":\"user1\"," "{\"uuid\":\"user1\","
+ "\"institutionId\":1," + "\"institutionId\":1,"
+ "\"name\":\"SEBAdmin\"," + "\"name\":\"SEBAdmin\","
+ "\"userName\":\"admin\"," + "\"username\":\"admin\","
+ "\"email\":\"admin@nomail.nomail\"," + "\"email\":\"admin@nomail.nomail\","
+ "\"active\":true," + "\"active\":true,"
+ "\"locale\":\"en\"," + "\"locale\":\"en\","
@ -68,7 +68,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTest {
"{\"uuid\":\"user2\"," "{\"uuid\":\"user2\","
+ "\"institutionId\":1," + "\"institutionId\":1,"
+ "\"name\":\"Institutional1 Admin\"," + "\"name\":\"Institutional1 Admin\","
+ "\"userName\":\"inst1Admin\"," + "\"username\":\"inst1Admin\","
+ "\"email\":\"admin@nomail.nomail\"," + "\"email\":\"admin@nomail.nomail\","
+ "\"active\":true," + "\"active\":true,"
+ "\"locale\":\"en\"," + "\"locale\":\"en\","
@ -89,7 +89,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTest {
"{\"uuid\":\"user2\"," "{\"uuid\":\"user2\","
+ "\"institutionId\":1," + "\"institutionId\":1,"
+ "\"name\":\"Institutional1 Admin\"," + "\"name\":\"Institutional1 Admin\","
+ "\"userName\":\"inst1Admin\"," + "\"username\":\"inst1Admin\","
+ "\"email\":\"admin@nomail.nomail\"," + "\"email\":\"admin@nomail.nomail\","
+ "\"active\":true," + "\"active\":true,"
+ "\"locale\":\"en\"," + "\"locale\":\"en\","
@ -169,7 +169,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTest {
public void getAllUserInfoWithSearchUsernameLike() throws Exception { public void getAllUserInfoWithSearchUsernameLike() throws Exception {
final String token = getSebAdminAccess(); final String token = getSebAdminAccess();
final List<UserInfo> userInfos = this.jsonMapper.readValue( final List<UserInfo> userInfos = this.jsonMapper.readValue(
this.mockMvc.perform(get(this.endpoint + RestAPI.ENDPOINT_USER_ACCOUNT + "?userName=exam") this.mockMvc.perform(get(this.endpoint + RestAPI.ENDPOINT_USER_ACCOUNT + "?username=exam")
.header("Authorization", "Bearer " + token)) .header("Authorization", "Bearer " + token))
.andExpect(status().isOk()) .andExpect(status().isOk())
.andReturn().getResponse().getContentAsString(), .andReturn().getResponse().getContentAsString(),
@ -318,7 +318,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTest {
assertNotNull(user); assertNotNull(user);
assertEquals("User", user.name); assertEquals("User", user.name);
assertEquals("user1", user.userName); assertEquals("user1", user.username);
assertEquals("user@nomail.nomail", user.email); assertEquals("user@nomail.nomail", user.email);
assertEquals("[EXAM_SUPPORTER]", String.valueOf(user.roles)); assertEquals("[EXAM_SUPPORTER]", String.valueOf(user.roles));
@ -349,7 +349,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTest {
assertNotNull(modifiedUserResult); assertNotNull(modifiedUserResult);
assertEquals(user.uuid, modifiedUserResult.uuid); assertEquals(user.uuid, modifiedUserResult.uuid);
assertEquals("User", modifiedUserResult.name); assertEquals("User", modifiedUserResult.name);
assertEquals("newUser1", modifiedUserResult.userName); assertEquals("newUser1", modifiedUserResult.username);
assertEquals("newUser@nomail.nomail", modifiedUserResult.email); assertEquals("newUser@nomail.nomail", modifiedUserResult.email);
assertEquals("[EXAM_ADMIN, EXAM_SUPPORTER]", String.valueOf(modifiedUserResult.roles)); assertEquals("[EXAM_ADMIN, EXAM_SUPPORTER]", String.valueOf(modifiedUserResult.roles));
@ -364,7 +364,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTest {
assertNotNull(modifiedUserResult); assertNotNull(modifiedUserResult);
assertEquals("User", modifiedUserResult.name); assertEquals("User", modifiedUserResult.name);
assertEquals("newUser1", modifiedUserResult.userName); assertEquals("newUser1", modifiedUserResult.username);
assertEquals("newUser@nomail.nomail", modifiedUserResult.email); assertEquals("newUser@nomail.nomail", modifiedUserResult.email);
assertEquals("[EXAM_ADMIN, EXAM_SUPPORTER]", String.valueOf(modifiedUserResult.roles)); assertEquals("[EXAM_ADMIN, EXAM_SUPPORTER]", String.valueOf(modifiedUserResult.roles));
} }
@ -594,7 +594,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTest {
private UserInfo getUserInfo(final String name, final Collection<UserInfo> infos) { private UserInfo getUserInfo(final String name, final Collection<UserInfo> infos) {
return infos return infos
.stream() .stream()
.filter(ui -> ui.userName.equals(name)) .filter(ui -> ui.username.equals(name))
.findFirst() .findFirst()
.orElseThrow(NoSuchElementException::new); .orElseThrow(NoSuchElementException::new);
} }

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

@ -301,7 +301,7 @@ CREATE TABLE IF NOT EXISTS `user` (
`institution_id` BIGINT UNSIGNED NULL, `institution_id` BIGINT UNSIGNED NULL,
`uuid` VARCHAR(255) NOT NULL, `uuid` VARCHAR(255) NOT NULL,
`name` VARCHAR(255) NOT NULL, `name` VARCHAR(255) NOT NULL,
`user_name` VARCHAR(255) NOT NULL, `username` VARCHAR(255) NOT NULL,
`password` VARCHAR(255) NOT NULL, `password` VARCHAR(255) NOT NULL,
`email` VARCHAR(255) NOT NULL, `email` VARCHAR(255) NOT NULL,
`locale` VARCHAR(45) NOT NULL, `locale` VARCHAR(45) NOT NULL,