diff --git a/pom.xml b/pom.xml index 2cd1a5cc..d4abc728 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,10 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-actuator + org.springframework.boot spring-boot-starter-tomcat diff --git a/src/main/java/ch/ethz/seb/sebserver/SEBServer.java b/src/main/java/ch/ethz/seb/sebserver/SEBServer.java index 6f9c31ed..f899d48a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/SEBServer.java +++ b/src/main/java/ch/ethz/seb/sebserver/SEBServer.java @@ -10,10 +10,11 @@ package ch.ethz.seb.sebserver; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.Configuration; @Configuration -@SpringBootApplication +@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) public class SEBServer { public static void main(final String[] args) { diff --git a/src/main/java/ch/ethz/seb/sebserver/Constants.java b/src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java similarity index 94% rename from src/main/java/ch/ethz/seb/sebserver/Constants.java rename to src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java index be9cb6c2..3083b02a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/Constants.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver; +package ch.ethz.seb.sebserver.gbl; import java.util.Calendar; import java.util.TimeZone; diff --git a/src/main/java/ch/ethz/seb/sebserver/model/Domain.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java similarity index 95% rename from src/main/java/ch/ethz/seb/sebserver/model/Domain.java rename to src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java index 0b2289dc..ad133663 100644 --- a/src/main/java/ch/ethz/seb/sebserver/model/Domain.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java @@ -1,11 +1,11 @@ -package ch.ethz.seb.sebserver.model; +package ch.ethz.seb.sebserver.gbl.model; import javax.annotation.Generated; /** Defines the global names of the domain model and domain model fields. * This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within the integrated GUI * This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/ -@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2018-11-12T16:16:23.438+01:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2018-11-14T08:29:18.574+01:00") interface Domain { interface ConfigurationAttribute { diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/profile/GuiProfile.java b/src/main/java/ch/ethz/seb/sebserver/gbl/profile/GuiProfile.java new file mode 100644 index 00000000..9a3708c9 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/profile/GuiProfile.java @@ -0,0 +1,22 @@ +/* + * 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.gbl.profile; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.springframework.context.annotation.Profile; + +@Target({ ElementType.TYPE, ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +@Profile({ "dev-gui", "prod-gui", "test" }) +public @interface GuiProfile { +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/profile/WebServiceProfile.java b/src/main/java/ch/ethz/seb/sebserver/gbl/profile/WebServiceProfile.java new file mode 100644 index 00000000..190e085a --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/profile/WebServiceProfile.java @@ -0,0 +1,22 @@ +/* + * 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.gbl.profile; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.springframework.context.annotation.Profile; + +@Target({ ElementType.TYPE, ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +@Profile({ "dev-ws", "prod-ws", "test" }) +public @interface WebServiceProfile { +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java new file mode 100644 index 00000000..1e565789 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/util/Result.java @@ -0,0 +1,116 @@ +/* + * 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.gbl.util; + +import java.util.function.Function; +import java.util.function.Supplier; + +/** A result of a computation that can either be the resulting value of the computation + * or an error if an exception/error has been thrown during the computation. + * + * Use this to make code more resilient at the same time as avoid many try-catch-blocks + * on root exceptions/errors and the need of nested exceptions. + * More specific: use this if a none void method should always give a result and never throw an exception + * by its own but reporting an exception when happen within the Result. + * + * 
+ *      public Result compute(String s1, String s2) {
+ *          try {
+ *              ... do some computation
+ *              return Result.of(result);
+ *          } catch (Throwable t) {
+ *              return Result.ofError(t);
+ *          }
+ *      }
+ *
+ * + * If you are familiar with java.util.Optional think of Result like an Optional with the + * capability to report an error. + * + * @param The type of the result value */ +public final class Result { + + /** The resulting value. May be null if an error occurred */ + private final T value; + /** The error when happened otherwise null */ + private final Throwable error; + + private Result(final T value) { + this.value = value; + this.error = null; + } + + private Result(final Throwable error) { + this.value = null; + this.error = error; + } + + /** @return the Value of the Result or null if there was an error */ + public T get() { + return this.value; + } + + /** @return the error if some was reporter or null if there was no error */ + public Throwable getError() { + return this.error; + } + + /** Use this to get the resulting value or (if null) to get a given other value + * + * @param other the other value to get if the computed value is null + * @return return either the computed value if existing or a given other value */ + public T orElse(final T other) { + return this.value != null ? this.value : other; + } + + public T orElse(final Supplier supplier) { + return this.value != null ? this.value : supplier.get(); + } + + public Result map(final Function mapf) { + if (this.error == null) { + return Result.of(mapf.apply(this.value)); + } else { + return Result.ofError(this.error); + } + } + + public Result flatMap(final Function> mapf) { + if (this.error == null) { + return mapf.apply(this.value); + } else { + return Result.ofError(this.error); + } + } + + public T onError(final Function errorHandler) { + return this.error != null ? errorHandler.apply(this.error) : this.value; + } + + public static final Result of(final T value) { + return new Result<>(value); + } + + public static final Result ofError(final Throwable error) { + return new Result<>(error); + } + + /** Use this to get the resulting value of existing or throw an Runtime exception with + * given message otherwise. + * + * @param message the message for the RuntimeException in error case + * @return the resulting value */ + public T onErrorThrow(final String message) { + if (this.error != null) { + throw new RuntimeException(message, this.error); + } + + return this.value; + } +} diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/WebGuiConfig.java b/src/main/java/ch/ethz/seb/sebserver/gui/WebGuiConfig.java new file mode 100644 index 00000000..cbac4a33 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/gui/WebGuiConfig.java @@ -0,0 +1,47 @@ +/* + * 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.gui; + +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; + +import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; + +@Configuration +@EnableWebSecurity +@GuiProfile +@Order(2) +public class WebGuiConfig extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(final HttpSecurity http) throws Exception { + System.out.println("**************** GuiWebConfig: "); + //@formatter:off + http + .sessionManagement() + .sessionCreationPolicy(SessionCreationPolicy.STATELESS) + .and() + .antMatcher("/gui/**") + .authorizeRequests() + .anyRequest() + .authenticated() + .and() + .formLogin().disable() + .httpBasic().disable() + .logout().disable() + .headers().frameOptions().disable() + .and() + .csrf().disable(); + //@formatter:on + } +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/WebServiceConfig.java b/src/main/java/ch/ethz/seb/sebserver/webservice/WebServiceConfig.java new file mode 100644 index 00000000..c8dd135b --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/WebServiceConfig.java @@ -0,0 +1,56 @@ +/* + * 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; + +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; + +import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; + +/** This is the main Spring configuration and also the main web-security-configuration for + * the web-service-part of the SEBServer. + * + * + * The web-service is designed as a stateless Rest based web-service defining various rest + * endpoints secured with OAuth (2) and some (web-socket) endpoints using specialized + * authentication filter. */ +@Configuration +@EnableWebSecurity +@WebServiceProfile +@Order(1) +public class WebServiceConfig extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(final HttpSecurity http) throws Exception { + System.out.println("**************** WebServiceWebConfig: "); + //@formatter:off + http + // The Web-Service is designed as a stateless Rest API + .sessionManagement() + .sessionCreationPolicy(SessionCreationPolicy.STATELESS) + .and() + .antMatcher("/webservice/**") + .authorizeRequests() + .anyRequest() + .authenticated() + .and() + // disable session based security and functionality + .formLogin().disable() + .httpBasic().disable() + .logout().disable() + .headers().frameOptions().disable() + .and() + .csrf().disable(); + //@formatter:on + } +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/WebServiceInit.java b/src/main/java/ch/ethz/seb/sebserver/webservice/WebServiceInit.java new file mode 100644 index 00000000..d4b9ed98 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/WebServiceInit.java @@ -0,0 +1,35 @@ +/* + * 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; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.stereotype.Component; + +import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; + +@Component +@WebServiceProfile +public class WebServiceInit implements ApplicationListener { + + private static final Logger log = LoggerFactory.getLogger(WebServiceInit.class); + + @Override + public void onApplicationEvent(final ApplicationReadyEvent event) { + System.out.println("****************** WebServiceInit"); + + log.info("Initialize SEB-Server Web-Service Component"); + + // TODO create an initial global admin account that expires after a defined time-frame (only if not already exists) + + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/batis/BatisConfig.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/BatisConfig.java new file mode 100644 index 00000000..c582c287 --- /dev/null +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/BatisConfig.java @@ -0,0 +1,58 @@ +/* + * 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.batis; + +import javax.sql.DataSource; + +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.SqlSessionTemplate; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Lazy; +import org.springframework.context.annotation.Profile; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; + +@Configuration +@MapperScan(basePackages = "ch.ethz.seb.sebserver.webservice.batis") +@Profile("dev-ws") +@Import(DataSourceAutoConfiguration.class) +public class BatisConfig { + + public static final String TRANSACTION_MANAGER = "transactionManager"; + public static final String SQL_SESSION_TEMPLATE = "sqlSessionTemplate"; + public static final String SQL_SESSION_FACTORY = "sqlSessionFactory"; + + @Lazy + @Bean(name = SQL_SESSION_FACTORY) + public SqlSessionFactory sqlSessionFactory(final DataSource dataSource) throws Exception { + final SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean(); + factoryBean.setDataSource(dataSource); + return factoryBean.getObject(); + } + + @Lazy + @Bean(name = SQL_SESSION_TEMPLATE) + public SqlSessionTemplate sqlSessionTemplate(final DataSource dataSource) throws Exception { + final SqlSessionTemplate sqlSessionTemplate = new SqlSessionTemplate(sqlSessionFactory(dataSource)); + return sqlSessionTemplate; + } + + @Lazy + @Bean(name = TRANSACTION_MANAGER) + public DataSourceTransactionManager transactionManager(final DataSource dataSource) { + final DataSourceTransactionManager transactionManager = new DataSourceTransactionManager(); + transactionManager.setDataSource(dataSource); + return transactionManager; + } + +} diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/JodaTimeTypeResolver.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/JodaTimeTypeResolver.java similarity index 94% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/JodaTimeTypeResolver.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/JodaTimeTypeResolver.java index e88c7bd9..af3e1a06 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/JodaTimeTypeResolver.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/JodaTimeTypeResolver.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.ws.batis; +package ch.ethz.seb.sebserver.webservice.batis; import java.sql.CallableStatement; import java.sql.PreparedStatement; @@ -22,7 +22,7 @@ import org.joda.time.LocalDateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ch.ethz.seb.sebserver.Constants; +import ch.ethz.seb.sebserver.gbl.Constants; /** Joda DateTime resolver for MyBatis TIMESTAMP to DateTime conversion and vis versa. This is used to convert MyBatis * TIMESTAMP type to Joda-Time's DateTime diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java similarity index 79% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java index 76b762c6..1c5edb09 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientConnectionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source Table: client_connection") public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.535+01:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source field: client_connection.id") public static final SqlColumn id = clientConnectionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.535+01:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source field: client_connection.exam_id") public static final SqlColumn examId = clientConnectionRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.535+01:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source field: client_connection.status") public static final SqlColumn status = clientConnectionRecord.status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.535+01:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source field: client_connection.connection_token") public static final SqlColumn connectionToken = clientConnectionRecord.connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.535+01:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source field: client_connection.user_name") public static final SqlColumn userName = clientConnectionRecord.userName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.535+01:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source field: client_connection.vdi") public static final SqlColumn vdi = clientConnectionRecord.vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.536+01:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source field: client_connection.client_address") public static final SqlColumn clientAddress = clientConnectionRecord.clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.536+01:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source field: client_connection.virtual_client_address") public static final SqlColumn virtualClientAddress = clientConnectionRecord.virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.535+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source Table: client_connection") public static final class ClientConnectionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientConnectionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientConnectionRecordMapper.java similarity index 88% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientConnectionRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientConnectionRecordMapper.java index a9317516..fe6a1358 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientConnectionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientConnectionRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.ClientConnectionRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.ClientConnectionRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.ClientConnectionRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.ClientConnectionRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientConnectionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.536+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.536+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source Table: client_connection") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.536+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source Table: client_connection") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.687+01:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ClientConnectionRecordMapper { }) ClientConnectionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.688+01:00", comments="Source Table: client_connection") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ClientConnectionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.688+01:00", comments="Source Table: client_connection") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.688+01:00", comments="Source Table: client_connection") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.688+01:00", comments="Source Table: client_connection") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.688+01:00", comments="Source Table: client_connection") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.688+01:00", comments="Source Table: client_connection") default int insert(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -111,7 +111,7 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.688+01:00", comments="Source Table: client_connection") default int insertSelective(ClientConnectionRecord record) { return insert(SqlBuilder.insert(record) .into(clientConnectionRecord) @@ -126,19 +126,19 @@ public interface ClientConnectionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.688+01:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.688+01:00", comments="Source Table: client_connection") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) .from(clientConnectionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.688+01:00", comments="Source Table: client_connection") default ClientConnectionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress) .from(clientConnectionRecord) @@ -147,7 +147,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.689+01:00", comments="Source Table: client_connection") default UpdateDSL> updateByExample(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalTo(record::getExamId) @@ -159,7 +159,7 @@ public interface ClientConnectionRecordMapper { .set(virtualClientAddress).equalTo(record::getVirtualClientAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.689+01:00", comments="Source Table: client_connection") default UpdateDSL> updateByExampleSelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -171,7 +171,7 @@ public interface ClientConnectionRecordMapper { .set(virtualClientAddress).equalToWhenPresent(record::getVirtualClientAddress); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.689+01:00", comments="Source Table: client_connection") default int updateByPrimaryKey(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalTo(record::getExamId) @@ -186,7 +186,7 @@ public interface ClientConnectionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.537+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.689+01:00", comments="Source Table: client_connection") default int updateByPrimaryKeySelective(ClientConnectionRecord record) { return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientEventRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientEventRecordDynamicSqlSupport.java similarity index 78% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientEventRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientEventRecordDynamicSqlSupport.java index 49a7d25c..ec056899 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientEventRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientEventRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.math.BigDecimal; import java.sql.JDBCType; @@ -7,31 +7,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ClientEventRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.691+01:00", comments="Source Table: client_event") public static final ClientEventRecord clientEventRecord = new ClientEventRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.692+01:00", comments="Source field: client_event.id") public static final SqlColumn id = clientEventRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.692+01:00", comments="Source field: client_event.connection_id") public static final SqlColumn connectionId = clientEventRecord.connectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.692+01:00", comments="Source field: client_event.user_identifier") public static final SqlColumn userIdentifier = clientEventRecord.userIdentifier; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.692+01:00", comments="Source field: client_event.type") public static final SqlColumn type = clientEventRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.692+01:00", comments="Source field: client_event.timestamp") public static final SqlColumn timestamp = clientEventRecord.timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.692+01:00", comments="Source field: client_event.numeric_value") public static final SqlColumn numericValue = clientEventRecord.numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.692+01:00", comments="Source field: client_event.text") public static final SqlColumn text = clientEventRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.691+01:00", comments="Source Table: client_event") public static final class ClientEventRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientEventRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientEventRecordMapper.java similarity index 87% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientEventRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientEventRecordMapper.java index 9aad9e84..8a4f4b9b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ClientEventRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ClientEventRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.ClientEventRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.ClientEventRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.ClientEventRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.ClientEventRecord; import java.math.BigDecimal; import java.util.List; import javax.annotation.Generated; @@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ClientEventRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.692+01:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ClientEventRecordMapper { }) ClientEventRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -72,22 +72,22 @@ public interface ClientEventRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord) .where(id, isEqualTo(id_)) @@ -95,7 +95,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default int insert(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -109,7 +109,7 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.540+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default int insertSelective(ClientEventRecord record) { return insert(SqlBuilder.insert(record) .into(clientEventRecord) @@ -123,19 +123,19 @@ public interface ClientEventRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.541+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.541+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text) .from(clientEventRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.541+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default ClientEventRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, userIdentifier, type, timestamp, numericValue, text) .from(clientEventRecord) @@ -144,7 +144,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.541+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default UpdateDSL> updateByExample(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalTo(record::getConnectionId) @@ -155,7 +155,7 @@ public interface ClientEventRecordMapper { .set(text).equalTo(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.541+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default UpdateDSL> updateByExampleSelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalToWhenPresent(record::getConnectionId) @@ -166,7 +166,7 @@ public interface ClientEventRecordMapper { .set(text).equalToWhenPresent(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.541+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default int updateByPrimaryKey(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalTo(record::getConnectionId) @@ -180,7 +180,7 @@ public interface ClientEventRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.541+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.693+01:00", comments="Source Table: client_event") default int updateByPrimaryKeySelective(ClientEventRecord record) { return UpdateDSL.updateWithMapper(this::update, clientEventRecord) .set(connectionId).equalToWhenPresent(record::getConnectionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java similarity index 79% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java index ffe38f9a..b42d8d00 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationAttributeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.386+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.523+01:00", comments="Source Table: configuration_attribute") public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.390+01:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.525+01:00", comments="Source field: configuration_attribute.id") public static final SqlColumn id = configurationAttributeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.391+01:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.526+01:00", comments="Source field: configuration_attribute.name") public static final SqlColumn name = configurationAttributeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.391+01:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.527+01:00", comments="Source field: configuration_attribute.type") public static final SqlColumn type = configurationAttributeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.392+01:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.527+01:00", comments="Source field: configuration_attribute.parent_id") public static final SqlColumn parentId = configurationAttributeRecord.parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.396+01:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.527+01:00", comments="Source field: configuration_attribute.resources") public static final SqlColumn resources = configurationAttributeRecord.resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.397+01:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.528+01:00", comments="Source field: configuration_attribute.validator") public static final SqlColumn validator = configurationAttributeRecord.validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.397+01:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.528+01:00", comments="Source field: configuration_attribute.dependencies") public static final SqlColumn dependencies = configurationAttributeRecord.dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.398+01:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.528+01:00", comments="Source field: configuration_attribute.default_value") public static final SqlColumn defaultValue = configurationAttributeRecord.defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.390+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.525+01:00", comments="Source Table: configuration_attribute") public static final class ConfigurationAttributeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationAttributeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationAttributeRecordMapper.java similarity index 88% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationAttributeRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationAttributeRecordMapper.java index 3dae6a6f..dd6d4286 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationAttributeRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationAttributeRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.ConfigurationAttributeRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.ConfigurationAttributeRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.ConfigurationAttributeRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.ConfigurationAttributeRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationAttributeRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.400+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.530+01:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.402+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.532+01:00", comments="Source Table: configuration_attribute") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.404+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.532+01:00", comments="Source Table: configuration_attribute") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.406+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.534+01:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -59,7 +59,7 @@ public interface ConfigurationAttributeRecordMapper { }) ConfigurationAttributeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.407+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.535+01:00", comments="Source Table: configuration_attribute") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -73,22 +73,22 @@ public interface ConfigurationAttributeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.408+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.536+01:00", comments="Source Table: configuration_attribute") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.409+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.537+01:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.409+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.537+01:00", comments="Source Table: configuration_attribute") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.410+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.538+01:00", comments="Source Table: configuration_attribute") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord) .where(id, isEqualTo(id_)) @@ -96,7 +96,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.411+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.539+01:00", comments="Source Table: configuration_attribute") default int insert(ConfigurationAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationAttributeRecord) @@ -111,7 +111,7 @@ public interface ConfigurationAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.413+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.541+01:00", comments="Source Table: configuration_attribute") default int insertSelective(ConfigurationAttributeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationAttributeRecord) @@ -126,19 +126,19 @@ public interface ConfigurationAttributeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.414+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.542+01:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.415+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.543+01:00", comments="Source Table: configuration_attribute") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.417+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.544+01:00", comments="Source Table: configuration_attribute") default ConfigurationAttributeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, type, parentId, resources, validator, dependencies, defaultValue) .from(configurationAttributeRecord) @@ -147,7 +147,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.418+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.547+01:00", comments="Source Table: configuration_attribute") default UpdateDSL> updateByExample(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalTo(record::getName) @@ -159,7 +159,7 @@ public interface ConfigurationAttributeRecordMapper { .set(defaultValue).equalTo(record::getDefaultValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.419+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.548+01:00", comments="Source Table: configuration_attribute") default UpdateDSL> updateByExampleSelective(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalToWhenPresent(record::getName) @@ -171,7 +171,7 @@ public interface ConfigurationAttributeRecordMapper { .set(defaultValue).equalToWhenPresent(record::getDefaultValue); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.420+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.549+01:00", comments="Source Table: configuration_attribute") default int updateByPrimaryKey(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalTo(record::getName) @@ -186,7 +186,7 @@ public interface ConfigurationAttributeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.422+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.551+01:00", comments="Source Table: configuration_attribute") default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java similarity index 78% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java index 34c7fec4..3e832db8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationNodeRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.673+01:00", comments="Source Table: configuration_node") public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.673+01:00", comments="Source field: configuration_node.id") public static final SqlColumn id = configurationNodeRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.673+01:00", comments="Source field: configuration_node.institution_id") public static final SqlColumn institutionId = configurationNodeRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.673+01:00", comments="Source field: configuration_node.owner") public static final SqlColumn owner = configurationNodeRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.673+01:00", comments="Source field: configuration_node.name") public static final SqlColumn name = configurationNodeRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.673+01:00", comments="Source field: configuration_node.description") public static final SqlColumn description = configurationNodeRecord.description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.673+01:00", comments="Source field: configuration_node.type") public static final SqlColumn type = configurationNodeRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source field: configuration_node.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source field: configuration_node.template") public static final SqlColumn template = configurationNodeRecord.template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.673+01:00", comments="Source Table: configuration_node") public static final class ConfigurationNodeRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationNodeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationNodeRecordMapper.java similarity index 87% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationNodeRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationNodeRecordMapper.java index 102e9a9d..1bf32537 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationNodeRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationNodeRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.ConfigurationNodeRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.ConfigurationNodeRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.ConfigurationNodeRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.ConfigurationNodeRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationNodeRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface ConfigurationNodeRecordMapper { }) ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -71,22 +71,22 @@ public interface ConfigurationNodeRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.524+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord) .where(id, isEqualTo(id_)) @@ -94,7 +94,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") default int insert(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -108,7 +108,7 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.674+01:00", comments="Source Table: configuration_node") default int insertSelective(ConfigurationNodeRecord record) { return insert(SqlBuilder.insert(record) .into(configurationNodeRecord) @@ -122,19 +122,19 @@ public interface ConfigurationNodeRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.675+01:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.675+01:00", comments="Source Table: configuration_node") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template) .from(configurationNodeRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.675+01:00", comments="Source Table: configuration_node") default ConfigurationNodeRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, name, description, type, template) .from(configurationNodeRecord) @@ -143,7 +143,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.675+01:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExample(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -154,7 +154,7 @@ public interface ConfigurationNodeRecordMapper { .set(template).equalTo(record::getTemplate); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.675+01:00", comments="Source Table: configuration_node") default UpdateDSL> updateByExampleSelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -165,7 +165,7 @@ public interface ConfigurationNodeRecordMapper { .set(template).equalToWhenPresent(record::getTemplate); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.675+01:00", comments="Source Table: configuration_node") default int updateByPrimaryKey(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -179,7 +179,7 @@ public interface ConfigurationNodeRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.675+01:00", comments="Source Table: configuration_node") default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationRecordDynamicSqlSupport.java similarity index 75% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationRecordDynamicSqlSupport.java index f72b42b7..6519c027 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -7,25 +7,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.515+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.668+01:00", comments="Source Table: configuration") public static final ConfigurationRecord configurationRecord = new ConfigurationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.517+01:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.668+01:00", comments="Source field: configuration.id") public static final SqlColumn id = configurationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.517+01:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.668+01:00", comments="Source field: configuration.configuration_node_id") public static final SqlColumn configurationNodeId = configurationRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.517+01:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.668+01:00", comments="Source field: configuration.version") public static final SqlColumn version = configurationRecord.version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.518+01:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.669+01:00", comments="Source field: configuration.version_date") public static final SqlColumn versionDate = configurationRecord.versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.518+01:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.669+01:00", comments="Source field: configuration.followup") public static final SqlColumn followup = configurationRecord.followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.516+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.668+01:00", comments="Source Table: configuration") public static final class ConfigurationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); @@ -33,7 +33,7 @@ public final class ConfigurationRecordDynamicSqlSupport { public final SqlColumn version = column("version", JDBCType.VARCHAR); - public final SqlColumn versionDate = column("version_date", JDBCType.TIMESTAMP, "ch.ethz.seb.sebserver.ws.batis.JodaTimeTypeResolver"); + public final SqlColumn versionDate = column("version_date", JDBCType.TIMESTAMP, "ch.ethz.seb.sebserver.webservice.batis.JodaTimeTypeResolver"); public final SqlColumn followup = column("followup", JDBCType.INTEGER); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationRecordMapper.java similarity index 86% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationRecordMapper.java index 0f029500..6d49368d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationRecordMapper.java @@ -1,10 +1,10 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.ConfigurationRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.ConfigurationRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.JodaTimeTypeResolver; -import ch.ethz.seb.sebserver.ws.batis.model.ConfigurationRecord; +import ch.ethz.seb.sebserver.webservice.batis.JodaTimeTypeResolver; +import ch.ethz.seb.sebserver.webservice.batis.model.ConfigurationRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.519+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.669+01:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.519+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.669+01:00", comments="Source Table: configuration") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.519+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.669+01:00", comments="Source Table: configuration") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.519+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.669+01:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -58,7 +58,7 @@ public interface ConfigurationRecordMapper { }) ConfigurationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.519+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.669+01:00", comments="Source Table: configuration") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ConfigurationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.520+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.669+01:00", comments="Source Table: configuration") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.520+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.669+01:00", comments="Source Table: configuration") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.520+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.670+01:00", comments="Source Table: configuration") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.520+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.670+01:00", comments="Source Table: configuration") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.520+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.670+01:00", comments="Source Table: configuration") default int insert(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -104,7 +104,7 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.520+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.670+01:00", comments="Source Table: configuration") default int insertSelective(ConfigurationRecord record) { return insert(SqlBuilder.insert(record) .into(configurationRecord) @@ -116,19 +116,19 @@ public interface ConfigurationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.520+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.670+01:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.520+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.670+01:00", comments="Source Table: configuration") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup) .from(configurationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.521+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.670+01:00", comments="Source Table: configuration") default ConfigurationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, configurationNodeId, version, versionDate, followup) .from(configurationRecord) @@ -137,7 +137,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.521+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.670+01:00", comments="Source Table: configuration") default UpdateDSL> updateByExample(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(configurationNodeId).equalTo(record::getConfigurationNodeId) @@ -146,7 +146,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalTo(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.521+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.670+01:00", comments="Source Table: configuration") default UpdateDSL> updateByExampleSelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId) @@ -155,7 +155,7 @@ public interface ConfigurationRecordMapper { .set(followup).equalToWhenPresent(record::getFollowup); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.521+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.671+01:00", comments="Source Table: configuration") default int updateByPrimaryKey(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(configurationNodeId).equalTo(record::getConfigurationNodeId) @@ -167,7 +167,7 @@ public interface ConfigurationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.521+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.671+01:00", comments="Source Table: configuration") default int updateByPrimaryKeySelective(ConfigurationRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationRecord) .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java similarity index 79% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java index f08ba5e1..a7775642 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ConfigurationValueRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.497+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.654+01:00", comments="Source Table: configuration_value") public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.497+01:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.654+01:00", comments="Source field: configuration_value.id") public static final SqlColumn id = configurationValueRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.497+01:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.654+01:00", comments="Source field: configuration_value.configuration_id") public static final SqlColumn configurationId = configurationValueRecord.configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.497+01:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.654+01:00", comments="Source field: configuration_value.configuration_attribute_id") public static final SqlColumn configurationAttributeId = configurationValueRecord.configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.497+01:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.655+01:00", comments="Source field: configuration_value.list_index") public static final SqlColumn listIndex = configurationValueRecord.listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.498+01:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.655+01:00", comments="Source field: configuration_value.value") public static final SqlColumn value = configurationValueRecord.value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.498+01:00", comments="Source field: configuration_value.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.655+01:00", comments="Source field: configuration_value.text") public static final SqlColumn text = configurationValueRecord.text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.497+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.654+01:00", comments="Source Table: configuration_value") public static final class ConfigurationValueRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationValueRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationValueRecordMapper.java similarity index 87% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationValueRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationValueRecordMapper.java index 0c8967bc..94a24a7d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ConfigurationValueRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ConfigurationValueRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.ConfigurationValueRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.ConfigurationValueRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.ConfigurationValueRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.ConfigurationValueRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ConfigurationValueRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.501+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.655+01:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.501+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.655+01:00", comments="Source Table: configuration_value") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.501+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.655+01:00", comments="Source Table: configuration_value") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.501+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.655+01:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ConfigurationValueRecordMapper { }) ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.501+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.655+01:00", comments="Source Table: configuration_value") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ConfigurationValueRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.501+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.656+01:00", comments="Source Table: configuration_value") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.501+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.656+01:00", comments="Source Table: configuration_value") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.501+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.656+01:00", comments="Source Table: configuration_value") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.501+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.656+01:00", comments="Source Table: configuration_value") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.502+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.656+01:00", comments="Source Table: configuration_value") default int insert(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -105,7 +105,7 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.502+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.656+01:00", comments="Source Table: configuration_value") default int insertSelective(ConfigurationValueRecord record) { return insert(SqlBuilder.insert(record) .into(configurationValueRecord) @@ -118,19 +118,19 @@ public interface ConfigurationValueRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.502+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.656+01:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.502+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.656+01:00", comments="Source Table: configuration_value") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text) .from(configurationValueRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.502+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.656+01:00", comments="Source Table: configuration_value") default ConfigurationValueRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, configurationId, configurationAttributeId, listIndex, value, text) .from(configurationValueRecord) @@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.502+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.657+01:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExample(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(configurationId).equalTo(record::getConfigurationId) @@ -149,7 +149,7 @@ public interface ConfigurationValueRecordMapper { .set(text).equalTo(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.502+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.657+01:00", comments="Source Table: configuration_value") default UpdateDSL> updateByExampleSelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(configurationId).equalToWhenPresent(record::getConfigurationId) @@ -159,7 +159,7 @@ public interface ConfigurationValueRecordMapper { .set(text).equalToWhenPresent(record::getText); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.502+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.657+01:00", comments="Source Table: configuration_value") default int updateByPrimaryKey(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(configurationId).equalTo(record::getConfigurationId) @@ -172,7 +172,7 @@ public interface ConfigurationValueRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.502+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.658+01:00", comments="Source Table: configuration_value") default int updateByPrimaryKeySelective(ConfigurationValueRecord record) { return UpdateDSL.updateWithMapper(this::update, configurationValueRecord) .set(configurationId).equalToWhenPresent(record::getConfigurationId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java similarity index 79% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java index ed838dfd..c1d85e2b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamConfigurationMapRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.677+01:00", comments="Source Table: exam_configuration_map") public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.677+01:00", comments="Source field: exam_configuration_map.id") public static final SqlColumn id = examConfigurationMapRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.677+01:00", comments="Source field: exam_configuration_map.exam_id") public static final SqlColumn examId = examConfigurationMapRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.677+01:00", comments="Source field: exam_configuration_map.configuration_node_id") public static final SqlColumn configurationNodeId = examConfigurationMapRecord.configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.677+01:00", comments="Source field: exam_configuration_map.user_names") public static final SqlColumn userNames = examConfigurationMapRecord.userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.677+01:00", comments="Source Table: exam_configuration_map") public static final class ExamConfigurationMapRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamConfigurationMapRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamConfigurationMapRecordMapper.java similarity index 85% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamConfigurationMapRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamConfigurationMapRecordMapper.java index 5a1855cd..6a8b62b6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamConfigurationMapRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamConfigurationMapRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.ExamConfigurationMapRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.ExamConfigurationMapRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.ExamConfigurationMapRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.ExamConfigurationMapRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamConfigurationMapRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.677+01:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.527+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.677+01:00", comments="Source Table: exam_configuration_map") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.527+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.527+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -55,7 +55,7 @@ public interface ExamConfigurationMapRecordMapper { }) ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.527+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -65,22 +65,22 @@ public interface ExamConfigurationMapRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.527+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord) .where(id, isEqualTo(id_)) @@ -88,7 +88,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") default int insert(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -99,7 +99,7 @@ public interface ExamConfigurationMapRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") default int insertSelective(ExamConfigurationMapRecord record) { return insert(SqlBuilder.insert(record) .into(examConfigurationMapRecord) @@ -110,19 +110,19 @@ public interface ExamConfigurationMapRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, configurationNodeId, userNames) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.678+01:00", comments="Source Table: exam_configuration_map") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, configurationNodeId, userNames) .from(examConfigurationMapRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.679+01:00", comments="Source Table: exam_configuration_map") default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, configurationNodeId, userNames) .from(examConfigurationMapRecord) @@ -131,7 +131,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.679+01:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExample(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(examId).equalTo(record::getExamId) @@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper { .set(userNames).equalTo(record::getUserNames); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.679+01:00", comments="Source Table: exam_configuration_map") default UpdateDSL> updateByExampleSelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -147,7 +147,7 @@ public interface ExamConfigurationMapRecordMapper { .set(userNames).equalToWhenPresent(record::getUserNames); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.679+01:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKey(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(examId).equalTo(record::getExamId) @@ -158,7 +158,7 @@ public interface ExamConfigurationMapRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.528+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.679+01:00", comments="Source Table: exam_configuration_map") default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) { return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamRecordDynamicSqlSupport.java similarity index 76% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamRecordDynamicSqlSupport.java index b8814b3c..a05e84d7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class ExamRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.530+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.681+01:00", comments="Source Table: exam") public static final ExamRecord examRecord = new ExamRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.530+01:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.681+01:00", comments="Source field: exam.id") public static final SqlColumn id = examRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.531+01:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.681+01:00", comments="Source field: exam.lms_setup_id") public static final SqlColumn lmsSetupId = examRecord.lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.531+01:00", comments="Source field: exam.external_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.682+01:00", comments="Source field: exam.external_uuid") public static final SqlColumn externalUuid = examRecord.externalUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.531+01:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.682+01:00", comments="Source field: exam.owner") public static final SqlColumn owner = examRecord.owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.531+01:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.682+01:00", comments="Source field: exam.supporter") public static final SqlColumn supporter = examRecord.supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.531+01:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.682+01:00", comments="Source field: exam.type") public static final SqlColumn type = examRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.530+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.681+01:00", comments="Source Table: exam") public static final class ExamRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamRecordMapper.java similarity index 86% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamRecordMapper.java index 53bb356f..c917bd2b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/ExamRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/ExamRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.ExamRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.ExamRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.ExamRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.ExamRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface ExamRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.531+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.682+01:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.531+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.682+01:00", comments="Source Table: exam") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.531+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.682+01:00", comments="Source Table: exam") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.531+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.682+01:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -57,7 +57,7 @@ public interface ExamRecordMapper { }) ExamRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.682+01:00", comments="Source Table: exam") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -69,22 +69,22 @@ public interface ExamRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.682+01:00", comments="Source Table: exam") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.683+01:00", comments="Source Table: exam") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.683+01:00", comments="Source Table: exam") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.683+01:00", comments="Source Table: exam") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, examRecord) .where(id, isEqualTo(id_)) @@ -92,7 +92,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.683+01:00", comments="Source Table: exam") default int insert(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -105,7 +105,7 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.683+01:00", comments="Source Table: exam") default int insertSelective(ExamRecord record) { return insert(SqlBuilder.insert(record) .into(examRecord) @@ -118,19 +118,19 @@ public interface ExamRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.683+01:00", comments="Source Table: exam") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, lmsSetupId, externalUuid, owner, supporter, type) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.683+01:00", comments="Source Table: exam") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, lmsSetupId, externalUuid, owner, supporter, type) .from(examRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.683+01:00", comments="Source Table: exam") default ExamRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, lmsSetupId, externalUuid, owner, supporter, type) .from(examRecord) @@ -139,7 +139,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.683+01:00", comments="Source Table: exam") default UpdateDSL> updateByExample(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(lmsSetupId).equalTo(record::getLmsSetupId) @@ -149,7 +149,7 @@ public interface ExamRecordMapper { .set(type).equalTo(record::getType); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.684+01:00", comments="Source Table: exam") default UpdateDSL> updateByExampleSelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(lmsSetupId).equalToWhenPresent(record::getLmsSetupId) @@ -159,7 +159,7 @@ public interface ExamRecordMapper { .set(type).equalToWhenPresent(record::getType); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.532+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.684+01:00", comments="Source Table: exam") default int updateByPrimaryKey(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(lmsSetupId).equalTo(record::getLmsSetupId) @@ -172,7 +172,7 @@ public interface ExamRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.533+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.684+01:00", comments="Source Table: exam") default int updateByPrimaryKeySelective(ExamRecord record) { return UpdateDSL.updateWithMapper(this::update, examRecord) .set(lmsSetupId).equalToWhenPresent(record::getLmsSetupId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/IndicatorRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/IndicatorRecordDynamicSqlSupport.java similarity index 76% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/IndicatorRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/IndicatorRecordDynamicSqlSupport.java index faee9996..00f82a9b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/IndicatorRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/IndicatorRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class IndicatorRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.695+01:00", comments="Source Table: indicator") public static final IndicatorRecord indicatorRecord = new IndicatorRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.695+01:00", comments="Source field: indicator.id") public static final SqlColumn id = indicatorRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.695+01:00", comments="Source field: indicator.exam_id") public static final SqlColumn examId = indicatorRecord.examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.695+01:00", comments="Source field: indicator.type") public static final SqlColumn type = indicatorRecord.type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.695+01:00", comments="Source field: indicator.name") public static final SqlColumn name = indicatorRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.695+01:00", comments="Source field: indicator.color") public static final SqlColumn color = indicatorRecord.color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.695+01:00", comments="Source Table: indicator") public static final class IndicatorRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/IndicatorRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/IndicatorRecordMapper.java similarity index 85% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/IndicatorRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/IndicatorRecordMapper.java index 6ae919c3..e9601b42 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/IndicatorRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/IndicatorRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.IndicatorRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.IndicatorRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.IndicatorRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.IndicatorRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface IndicatorRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.695+01:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -56,7 +56,7 @@ public interface IndicatorRecordMapper { }) IndicatorRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -67,22 +67,22 @@ public interface IndicatorRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.543+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord) .where(id, isEqualTo(id_)) @@ -90,7 +90,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.544+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") default int insert(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -102,7 +102,7 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.544+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") default int insertSelective(IndicatorRecord record) { return insert(SqlBuilder.insert(record) .into(indicatorRecord) @@ -114,19 +114,19 @@ public interface IndicatorRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.544+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, examId, type, name, color) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.544+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, type, name, color) .from(indicatorRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.544+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") default IndicatorRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, examId, type, name, color) .from(indicatorRecord) @@ -135,7 +135,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.544+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.696+01:00", comments="Source Table: indicator") default UpdateDSL> updateByExample(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -144,7 +144,7 @@ public interface IndicatorRecordMapper { .set(color).equalTo(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.544+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.697+01:00", comments="Source Table: indicator") default UpdateDSL> updateByExampleSelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) @@ -153,7 +153,7 @@ public interface IndicatorRecordMapper { .set(color).equalToWhenPresent(record::getColor); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.544+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.697+01:00", comments="Source Table: indicator") default int updateByPrimaryKey(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalTo(record::getExamId) @@ -165,7 +165,7 @@ public interface IndicatorRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.544+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.697+01:00", comments="Source Table: indicator") default int updateByPrimaryKeySelective(IndicatorRecord record) { return UpdateDSL.updateWithMapper(this::update, indicatorRecord) .set(examId).equalToWhenPresent(record::getExamId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/InstitutionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/InstitutionRecordDynamicSqlSupport.java similarity index 76% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/InstitutionRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/InstitutionRecordDynamicSqlSupport.java index 2e8beb03..6f60061b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/InstitutionRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/InstitutionRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class InstitutionRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.545+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source Table: institution") public static final InstitutionRecord institutionRecord = new InstitutionRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.545+01:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source field: institution.id") public static final SqlColumn id = institutionRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source field: institution.name") public static final SqlColumn name = institutionRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source field: institution.authtype") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source field: institution.authtype") public static final SqlColumn authtype = institutionRecord.authtype; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.545+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source Table: institution") public static final class InstitutionRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/InstitutionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/InstitutionRecordMapper.java similarity index 84% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/InstitutionRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/InstitutionRecordMapper.java index 322a71d7..d3d839be 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/InstitutionRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/InstitutionRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.InstitutionRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.InstitutionRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.InstitutionRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.InstitutionRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface InstitutionRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source Table: institution") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source Table: institution") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -54,7 +54,7 @@ public interface InstitutionRecordMapper { }) InstitutionRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source Table: institution") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -63,22 +63,22 @@ public interface InstitutionRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord) .where(id, isEqualTo(id_)) @@ -86,7 +86,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default int insert(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -96,7 +96,7 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default int insertSelective(InstitutionRecord record) { return insert(SqlBuilder.insert(record) .into(institutionRecord) @@ -106,19 +106,19 @@ public interface InstitutionRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, name, authtype) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, authtype) .from(institutionRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default InstitutionRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, name, authtype) .from(institutionRecord) @@ -127,21 +127,21 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.546+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default UpdateDSL> updateByExample(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) .set(authtype).equalTo(record::getAuthtype); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default UpdateDSL> updateByExampleSelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) .set(authtype).equalToWhenPresent(record::getAuthtype); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.699+01:00", comments="Source Table: institution") default int updateByPrimaryKey(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalTo(record::getName) @@ -151,7 +151,7 @@ public interface InstitutionRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.700+01:00", comments="Source Table: institution") default int updateByPrimaryKeySelective(InstitutionRecord record) { return UpdateDSL.updateWithMapper(this::update, institutionRecord) .set(name).equalToWhenPresent(record::getName) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/OrientationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/OrientationRecordDynamicSqlSupport.java similarity index 77% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/OrientationRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/OrientationRecordDynamicSqlSupport.java index fd840e3a..5097a630 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/OrientationRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/OrientationRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class OrientationRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.504+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.660+01:00", comments="Source Table: orientation") public static final OrientationRecord orientationRecord = new OrientationRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.504+01:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.660+01:00", comments="Source field: orientation.id") public static final SqlColumn id = orientationRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.505+01:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.660+01:00", comments="Source field: orientation.config_attribute_id") public static final SqlColumn configAttributeId = orientationRecord.configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.505+01:00", comments="Source field: orientation.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.661+01:00", comments="Source field: orientation.template") public static final SqlColumn template = orientationRecord.template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.505+01:00", comments="Source field: orientation.view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.661+01:00", comments="Source field: orientation.view") public static final SqlColumn view = orientationRecord.view; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.505+01:00", comments="Source field: orientation.group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.661+01:00", comments="Source field: orientation.group") public static final SqlColumn group = orientationRecord.group; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.505+01:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.661+01:00", comments="Source field: orientation.x_position") public static final SqlColumn xPosition = orientationRecord.xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.505+01:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.661+01:00", comments="Source field: orientation.y_position") public static final SqlColumn yPosition = orientationRecord.yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.505+01:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.661+01:00", comments="Source field: orientation.width") public static final SqlColumn width = orientationRecord.width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.506+01:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.661+01:00", comments="Source field: orientation.height") public static final SqlColumn height = orientationRecord.height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.504+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.660+01:00", comments="Source Table: orientation") public static final class OrientationRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/OrientationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/OrientationRecordMapper.java similarity index 88% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/OrientationRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/OrientationRecordMapper.java index 8ce37438..07aa54d9 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/OrientationRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/OrientationRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.OrientationRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.OrientationRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.OrientationRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.OrientationRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface OrientationRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.506+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.662+01:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.506+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.662+01:00", comments="Source Table: orientation") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.506+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.662+01:00", comments="Source Table: orientation") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.506+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.662+01:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -60,7 +60,7 @@ public interface OrientationRecordMapper { }) OrientationRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.506+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.662+01:00", comments="Source Table: orientation") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -75,22 +75,22 @@ public interface OrientationRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.506+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.662+01:00", comments="Source Table: orientation") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.506+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.662+01:00", comments="Source Table: orientation") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.506+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.663+01:00", comments="Source Table: orientation") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.506+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.663+01:00", comments="Source Table: orientation") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord) .where(id, isEqualTo(id_)) @@ -98,7 +98,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.507+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.663+01:00", comments="Source Table: orientation") default int insert(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -114,7 +114,7 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.509+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.663+01:00", comments="Source Table: orientation") default int insertSelective(OrientationRecord record) { return insert(SqlBuilder.insert(record) .into(orientationRecord) @@ -130,19 +130,19 @@ public interface OrientationRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.510+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.663+01:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.510+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.664+01:00", comments="Source Table: orientation") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) .from(orientationRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.510+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.664+01:00", comments="Source Table: orientation") default OrientationRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, template, view, group, xPosition, yPosition, width, height) .from(orientationRecord) @@ -151,7 +151,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.510+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.664+01:00", comments="Source Table: orientation") default UpdateDSL> updateByExample(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -164,7 +164,7 @@ public interface OrientationRecordMapper { .set(height).equalTo(record::getHeight); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.510+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.664+01:00", comments="Source Table: orientation") default UpdateDSL> updateByExampleSelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) @@ -177,7 +177,7 @@ public interface OrientationRecordMapper { .set(height).equalToWhenPresent(record::getHeight); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.510+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.664+01:00", comments="Source Table: orientation") default int updateByPrimaryKey(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalTo(record::getConfigAttributeId) @@ -193,7 +193,7 @@ public interface OrientationRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.510+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.665+01:00", comments="Source Table: orientation") default int updateByPrimaryKeySelective(OrientationRecord record) { return UpdateDSL.updateWithMapper(this::update, orientationRecord) .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/RoleRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/RoleRecordDynamicSqlSupport.java similarity index 75% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/RoleRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/RoleRecordDynamicSqlSupport.java index 9ecdac6d..d3de8f5a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/RoleRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/RoleRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class RoleRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") public static final RoleRecord roleRecord = new RoleRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source field: user_role.id") public static final SqlColumn id = roleRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source field: user_role.user_id") public static final SqlColumn userId = roleRecord.userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source field: user_role.role_name") public static final SqlColumn roleName = roleRecord.roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") public static final class RoleRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/RoleRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/RoleRecordMapper.java similarity index 84% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/RoleRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/RoleRecordMapper.java index 0789bf5f..b2f5b273 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/RoleRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/RoleRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.RoleRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.RoleRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.RoleRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.RoleRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface RoleRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -54,7 +54,7 @@ public interface RoleRecordMapper { }) RoleRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -63,22 +63,22 @@ public interface RoleRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord) .where(id, isEqualTo(id_)) @@ -86,7 +86,7 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.712+01:00", comments="Source Table: user_role") default int insert(RoleRecord record) { return insert(SqlBuilder.insert(record) .into(roleRecord) @@ -96,7 +96,7 @@ public interface RoleRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.713+01:00", comments="Source Table: user_role") default int insertSelective(RoleRecord record) { return insert(SqlBuilder.insert(record) .into(roleRecord) @@ -106,19 +106,19 @@ public interface RoleRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.713+01:00", comments="Source Table: user_role") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, userId, roleName) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.713+01:00", comments="Source Table: user_role") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userId, roleName) .from(roleRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.713+01:00", comments="Source Table: user_role") default RoleRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, userId, roleName) .from(roleRecord) @@ -127,21 +127,21 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.713+01:00", comments="Source Table: user_role") default UpdateDSL> updateByExample(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalTo(record::getUserId) .set(roleName).equalTo(record::getRoleName); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.713+01:00", comments="Source Table: user_role") default UpdateDSL> updateByExampleSelective(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalToWhenPresent(record::getUserId) .set(roleName).equalToWhenPresent(record::getRoleName); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.713+01:00", comments="Source Table: user_role") default int updateByPrimaryKey(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalTo(record::getUserId) @@ -151,7 +151,7 @@ public interface RoleRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.555+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.714+01:00", comments="Source Table: user_role") default int updateByPrimaryKeySelective(RoleRecord record) { return UpdateDSL.updateWithMapper(this::update, roleRecord) .set(userId).equalToWhenPresent(record::getUserId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/SebLmsSetupRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/SebLmsSetupRecordDynamicSqlSupport.java similarity index 78% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/SebLmsSetupRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/SebLmsSetupRecordDynamicSqlSupport.java index f5ec80ee..515b2496 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/SebLmsSetupRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/SebLmsSetupRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class SebLmsSetupRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source Table: seb_lms_setup") public static final SebLmsSetupRecord sebLmsSetupRecord = new SebLmsSetupRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.702+01:00", comments="Source field: seb_lms_setup.id") public static final SqlColumn id = sebLmsSetupRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.702+01:00", comments="Source field: seb_lms_setup.institution_id") public static final SqlColumn institutionId = sebLmsSetupRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.702+01:00", comments="Source field: seb_lms_setup.name") public static final SqlColumn name = sebLmsSetupRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source field: seb_lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.702+01:00", comments="Source field: seb_lms_setup.lms_type") public static final SqlColumn lmsType = sebLmsSetupRecord.lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source field: seb_lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.702+01:00", comments="Source field: seb_lms_setup.lms_url") public static final SqlColumn lmsUrl = sebLmsSetupRecord.lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source field: seb_lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.702+01:00", comments="Source field: seb_lms_setup.lms_clientname") public static final SqlColumn lmsClientname = sebLmsSetupRecord.lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source field: seb_lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.702+01:00", comments="Source field: seb_lms_setup.lms_clientsecret") public static final SqlColumn lmsClientsecret = sebLmsSetupRecord.lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source field: seb_lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.702+01:00", comments="Source field: seb_lms_setup.lms_rest_api_token") public static final SqlColumn lmsRestApiToken = sebLmsSetupRecord.lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source field: seb_lms_setup.seb_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.702+01:00", comments="Source field: seb_lms_setup.seb_clientname") public static final SqlColumn sebClientname = sebLmsSetupRecord.sebClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source field: seb_lms_setup.seb_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source field: seb_lms_setup.seb_clientsecret") public static final SqlColumn sebClientsecret = sebLmsSetupRecord.sebClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.702+01:00", comments="Source Table: seb_lms_setup") public static final class SebLmsSetupRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/SebLmsSetupRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/SebLmsSetupRecordMapper.java similarity index 89% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/SebLmsSetupRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/SebLmsSetupRecordMapper.java index a4a5d707..e5b64ed1 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/SebLmsSetupRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/SebLmsSetupRecordMapper.java @@ -1,9 +1,9 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.SebLmsSetupRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.SebLmsSetupRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.model.SebLmsSetupRecord; +import ch.ethz.seb.sebserver.webservice.batis.model.SebLmsSetupRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface SebLmsSetupRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -61,7 +61,7 @@ public interface SebLmsSetupRecordMapper { }) SebLmsSetupRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -77,22 +77,22 @@ public interface SebLmsSetupRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(sebLmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, sebLmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, sebLmsSetupRecord) .where(id, isEqualTo(id_)) @@ -100,7 +100,7 @@ public interface SebLmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") default int insert(SebLmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(sebLmsSetupRecord) @@ -117,7 +117,7 @@ public interface SebLmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.549+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.703+01:00", comments="Source Table: seb_lms_setup") default int insertSelective(SebLmsSetupRecord record) { return insert(SqlBuilder.insert(record) .into(sebLmsSetupRecord) @@ -134,19 +134,19 @@ public interface SebLmsSetupRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.704+01:00", comments="Source Table: seb_lms_setup") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret) .from(sebLmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.704+01:00", comments="Source Table: seb_lms_setup") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret) .from(sebLmsSetupRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.704+01:00", comments="Source Table: seb_lms_setup") default SebLmsSetupRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret) .from(sebLmsSetupRecord) @@ -155,7 +155,7 @@ public interface SebLmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.704+01:00", comments="Source Table: seb_lms_setup") default UpdateDSL> updateByExample(SebLmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, sebLmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -169,7 +169,7 @@ public interface SebLmsSetupRecordMapper { .set(sebClientsecret).equalTo(record::getSebClientsecret); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.704+01:00", comments="Source Table: seb_lms_setup") default UpdateDSL> updateByExampleSelective(SebLmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, sebLmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -183,7 +183,7 @@ public interface SebLmsSetupRecordMapper { .set(sebClientsecret).equalToWhenPresent(record::getSebClientsecret); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.704+01:00", comments="Source Table: seb_lms_setup") default int updateByPrimaryKey(SebLmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, sebLmsSetupRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -200,7 +200,7 @@ public interface SebLmsSetupRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.704+01:00", comments="Source Table: seb_lms_setup") default int updateByPrimaryKeySelective(SebLmsSetupRecord record) { return UpdateDSL.updateWithMapper(this::update, sebLmsSetupRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/UserRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/UserRecordDynamicSqlSupport.java similarity index 74% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/UserRecordDynamicSqlSupport.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/UserRecordDynamicSqlSupport.java index 58117e30..75dd904d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/UserRecordDynamicSqlSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/UserRecordDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; import java.sql.JDBCType; import javax.annotation.Generated; @@ -7,43 +7,43 @@ import org.mybatis.dynamic.sql.SqlColumn; import org.mybatis.dynamic.sql.SqlTable; public final class UserRecordDynamicSqlSupport { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.707+01:00", comments="Source Table: user") public static final UserRecord userRecord = new UserRecord(); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.708+01:00", comments="Source field: user.id") public static final SqlColumn id = userRecord.id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.708+01:00", comments="Source field: user.institution_id") public static final SqlColumn institutionId = userRecord.institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.708+01:00", comments="Source field: user.uuid") public static final SqlColumn uuid = userRecord.uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.708+01:00", comments="Source field: user.name") public static final SqlColumn name = userRecord.name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.708+01:00", comments="Source field: user.user_name") public static final SqlColumn userName = userRecord.userName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.708+01:00", comments="Source field: user.password") public static final SqlColumn password = userRecord.password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.709+01:00", comments="Source field: user.email") public static final SqlColumn email = userRecord.email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.709+01:00", comments="Source field: user.creation_date") public static final SqlColumn creationDate = userRecord.creationDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.709+01:00", comments="Source field: user.active") public static final SqlColumn active = userRecord.active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.locale") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.709+01:00", comments="Source field: user.locale") public static final SqlColumn locale = userRecord.locale; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.709+01:00", comments="Source field: user.timezone") public static final SqlColumn timezone = userRecord.timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.708+01:00", comments="Source Table: user") public static final class UserRecord extends SqlTable { public final SqlColumn id = column("id", JDBCType.BIGINT); @@ -59,7 +59,7 @@ public final class UserRecordDynamicSqlSupport { public final SqlColumn email = column("email", JDBCType.VARCHAR); - public final SqlColumn creationDate = column("creation_date", JDBCType.TIMESTAMP, "ch.ethz.seb.sebserver.ws.batis.JodaTimeTypeResolver"); + public final SqlColumn creationDate = column("creation_date", JDBCType.TIMESTAMP, "ch.ethz.seb.sebserver.webservice.batis.JodaTimeTypeResolver"); public final SqlColumn active = column("active", JDBCType.INTEGER); diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/UserRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/UserRecordMapper.java similarity index 88% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/UserRecordMapper.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/UserRecordMapper.java index eddbf9a6..64ff1b23 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/mapper/UserRecordMapper.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/mapper/UserRecordMapper.java @@ -1,10 +1,10 @@ -package ch.ethz.seb.sebserver.ws.batis.mapper; +package ch.ethz.seb.sebserver.webservice.batis.mapper; -import static ch.ethz.seb.sebserver.ws.batis.mapper.UserRecordDynamicSqlSupport.*; +import static ch.ethz.seb.sebserver.webservice.batis.mapper.UserRecordDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.*; -import ch.ethz.seb.sebserver.ws.batis.JodaTimeTypeResolver; -import ch.ethz.seb.sebserver.ws.batis.model.UserRecord; +import ch.ethz.seb.sebserver.webservice.batis.JodaTimeTypeResolver; +import ch.ethz.seb.sebserver.webservice.batis.model.UserRecord; import java.util.List; import javax.annotation.Generated; import org.apache.ibatis.annotations.Arg; @@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter; @Mapper public interface UserRecordMapper { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.709+01:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") long count(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.709+01:00", comments="Source Table: user") @DeleteProvider(type=SqlProviderAdapter.class, method="delete") int delete(DeleteStatementProvider deleteStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.709+01:00", comments="Source Table: user") @InsertProvider(type=SqlProviderAdapter.class, method="insert") @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class) int insert(InsertStatementProvider insertStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.552+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.709+01:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -64,7 +64,7 @@ public interface UserRecordMapper { }) UserRecord selectOne(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") @SelectProvider(type=SqlProviderAdapter.class, method="select") @ConstructorArgs({ @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true), @@ -81,22 +81,22 @@ public interface UserRecordMapper { }) List selectMany(SelectStatementProvider selectStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") @UpdateProvider(type=SqlProviderAdapter.class, method="update") int update(UpdateStatementProvider updateStatement); - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default QueryExpressionDSL> countByExample() { return SelectDSL.selectWithMapper(this::count, SqlBuilder.count()) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default DeleteDSL> deleteByExample() { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default int deleteByPrimaryKey(Long id_) { return DeleteDSL.deleteFromWithMapper(this::delete, userRecord) .where(id, isEqualTo(id_)) @@ -104,7 +104,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default int insert(UserRecord record) { return insert(SqlBuilder.insert(record) .into(userRecord) @@ -122,7 +122,7 @@ public interface UserRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default int insertSelective(UserRecord record) { return insert(SqlBuilder.insert(record) .into(userRecord) @@ -140,19 +140,19 @@ public interface UserRecordMapper { .render(RenderingStrategy.MYBATIS3)); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default QueryExpressionDSL>> selectByExample() { return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, userName, password, email, creationDate, active, locale, timezone) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default QueryExpressionDSL>> selectDistinctByExample() { return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, userName, password, email, creationDate, active, locale, timezone) .from(userRecord); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default UserRecord selectByPrimaryKey(Long id_) { return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, userName, password, email, creationDate, active, locale, timezone) .from(userRecord) @@ -161,7 +161,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default UpdateDSL> updateByExample(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -176,7 +176,7 @@ public interface UserRecordMapper { .set(timezone).equalTo(record::getTimezone); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default UpdateDSL> updateByExampleSelective(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) @@ -191,7 +191,7 @@ public interface UserRecordMapper { .set(timezone).equalToWhenPresent(record::getTimezone); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.710+01:00", comments="Source Table: user") default int updateByPrimaryKey(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalTo(record::getInstitutionId) @@ -209,7 +209,7 @@ public interface UserRecordMapper { .execute(); } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.553+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.711+01:00", comments="Source Table: user") default int updateByPrimaryKeySelective(UserRecord record) { return UpdateDSL.updateWithMapper(this::update, userRecord) .set(institutionId).equalToWhenPresent(record::getInstitutionId) diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ClientConnectionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ClientConnectionRecord.java similarity index 81% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ClientConnectionRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ClientConnectionRecord.java index 605dbff4..40a6b8f6 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ClientConnectionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ClientConnectionRecord.java @@ -1,33 +1,33 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class ClientConnectionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.533+01:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.685+01:00", comments="Source field: client_connection.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.533+01:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.685+01:00", comments="Source field: client_connection.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.685+01:00", comments="Source field: client_connection.status") private String status; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.685+01:00", comments="Source field: client_connection.connection_token") private String connectionToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source field: client_connection.user_name") private String userName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source field: client_connection.vdi") private Boolean vdi; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source field: client_connection.client_address") private String clientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source field: client_connection.virtual_client_address") private String virtualClientAddress; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.533+01:00", comments="Source Table: client_connection") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.684+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) { this.id = id; this.examId = examId; @@ -39,42 +39,42 @@ public class ClientConnectionRecord { this.virtualClientAddress = virtualClientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.533+01:00", comments="Source field: client_connection.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.685+01:00", comments="Source field: client_connection.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.685+01:00", comments="Source field: client_connection.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.status") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.685+01:00", comments="Source field: client_connection.status") public String getStatus() { return status; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.connection_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.685+01:00", comments="Source field: client_connection.connection_token") public String getConnectionToken() { return connectionToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source field: client_connection.user_name") public String getUserName() { return userName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.vdi") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source field: client_connection.vdi") public Boolean getVdi() { return vdi; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source field: client_connection.client_address") public String getClientAddress() { return clientAddress; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.534+01:00", comments="Source field: client_connection.virtual_client_address") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.686+01:00", comments="Source field: client_connection.virtual_client_address") public String getVirtualClientAddress() { return virtualClientAddress; } @@ -83,7 +83,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ClientConnectionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_connection * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ClientEventRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ClientEventRecord.java similarity index 80% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ClientEventRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ClientEventRecord.java index 026ce839..a841dd42 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ClientEventRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ClientEventRecord.java @@ -1,31 +1,31 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import java.math.BigDecimal; import javax.annotation.Generated; public class ClientEventRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.538+01:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.690+01:00", comments="Source field: client_event.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.538+01:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.690+01:00", comments="Source field: client_event.connection_id") private Long connectionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.538+01:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.690+01:00", comments="Source field: client_event.user_identifier") private String userIdentifier; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.538+01:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.690+01:00", comments="Source field: client_event.type") private Integer type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.691+01:00", comments="Source field: client_event.timestamp") private Long timestamp; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.691+01:00", comments="Source field: client_event.numeric_value") private BigDecimal numericValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.691+01:00", comments="Source field: client_event.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.538+01:00", comments="Source Table: client_event") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.690+01:00", comments="Source Table: client_event") public ClientEventRecord(Long id, Long connectionId, String userIdentifier, Integer type, Long timestamp, BigDecimal numericValue, String text) { this.id = id; this.connectionId = connectionId; @@ -36,37 +36,37 @@ public class ClientEventRecord { this.text = text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.538+01:00", comments="Source field: client_event.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.690+01:00", comments="Source field: client_event.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.538+01:00", comments="Source field: client_event.connection_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.690+01:00", comments="Source field: client_event.connection_id") public Long getConnectionId() { return connectionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.538+01:00", comments="Source field: client_event.user_identifier") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.690+01:00", comments="Source field: client_event.user_identifier") public String getUserIdentifier() { return userIdentifier; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.538+01:00", comments="Source field: client_event.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.691+01:00", comments="Source field: client_event.type") public Integer getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.timestamp") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.691+01:00", comments="Source field: client_event.timestamp") public Long getTimestamp() { return timestamp; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.numeric_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.691+01:00", comments="Source field: client_event.numeric_value") public BigDecimal getNumericValue() { return numericValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.539+01:00", comments="Source field: client_event.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.691+01:00", comments="Source field: client_event.text") public String getText() { return text; } @@ -75,7 +75,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -98,7 +98,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -125,7 +125,7 @@ public class ClientEventRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table client_event * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationAttributeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationAttributeRecord.java similarity index 81% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationAttributeRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationAttributeRecord.java index edb8781d..1256cf94 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationAttributeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationAttributeRecord.java @@ -1,33 +1,33 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class ConfigurationAttributeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.376+01:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.513+01:00", comments="Source field: configuration_attribute.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.377+01:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.514+01:00", comments="Source field: configuration_attribute.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.377+01:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.514+01:00", comments="Source field: configuration_attribute.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.377+01:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.514+01:00", comments="Source field: configuration_attribute.parent_id") private Long parentId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.378+01:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.515+01:00", comments="Source field: configuration_attribute.resources") private String resources; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.378+01:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.515+01:00", comments="Source field: configuration_attribute.validator") private String validator; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.379+01:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.515+01:00", comments="Source field: configuration_attribute.dependencies") private String dependencies; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.379+01:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.515+01:00", comments="Source field: configuration_attribute.default_value") private String defaultValue; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.372+01:00", comments="Source Table: configuration_attribute") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.503+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) { this.id = id; this.name = name; @@ -39,42 +39,42 @@ public class ConfigurationAttributeRecord { this.defaultValue = defaultValue; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.377+01:00", comments="Source field: configuration_attribute.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.514+01:00", comments="Source field: configuration_attribute.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.377+01:00", comments="Source field: configuration_attribute.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.514+01:00", comments="Source field: configuration_attribute.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.377+01:00", comments="Source field: configuration_attribute.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.514+01:00", comments="Source field: configuration_attribute.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.378+01:00", comments="Source field: configuration_attribute.parent_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.515+01:00", comments="Source field: configuration_attribute.parent_id") public Long getParentId() { return parentId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.378+01:00", comments="Source field: configuration_attribute.resources") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.515+01:00", comments="Source field: configuration_attribute.resources") public String getResources() { return resources; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.379+01:00", comments="Source field: configuration_attribute.validator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.515+01:00", comments="Source field: configuration_attribute.validator") public String getValidator() { return validator; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.379+01:00", comments="Source field: configuration_attribute.dependencies") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.515+01:00", comments="Source field: configuration_attribute.dependencies") public String getDependencies() { return dependencies; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.379+01:00", comments="Source field: configuration_attribute.default_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.516+01:00", comments="Source field: configuration_attribute.default_value") public String getDefaultValue() { return defaultValue; } @@ -83,7 +83,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -107,7 +107,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -135,7 +135,7 @@ public class ConfigurationAttributeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_attribute * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationNodeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationNodeRecord.java similarity index 80% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationNodeRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationNodeRecord.java index f76f0945..f5f90ae4 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationNodeRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationNodeRecord.java @@ -1,30 +1,30 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class ConfigurationNodeRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.522+01:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.671+01:00", comments="Source field: configuration_node.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.522+01:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.671+01:00", comments="Source field: configuration_node.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.522+01:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.672+01:00", comments="Source field: configuration_node.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.672+01:00", comments="Source field: configuration_node.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.672+01:00", comments="Source field: configuration_node.description") private String description; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.672+01:00", comments="Source field: configuration_node.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source field: configuration_node.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.672+01:00", comments="Source field: configuration_node.template") private String template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.522+01:00", comments="Source Table: configuration_node") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.671+01:00", comments="Source Table: configuration_node") public ConfigurationNodeRecord(Long id, Long institutionId, String owner, String name, String description, String type, String template) { this.id = id; this.institutionId = institutionId; @@ -35,37 +35,37 @@ public class ConfigurationNodeRecord { this.template = template; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.522+01:00", comments="Source field: configuration_node.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.671+01:00", comments="Source field: configuration_node.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.522+01:00", comments="Source field: configuration_node.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.671+01:00", comments="Source field: configuration_node.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.522+01:00", comments="Source field: configuration_node.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.672+01:00", comments="Source field: configuration_node.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source field: configuration_node.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.672+01:00", comments="Source field: configuration_node.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source field: configuration_node.description") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.672+01:00", comments="Source field: configuration_node.description") public String getDescription() { return description; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source field: configuration_node.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.672+01:00", comments="Source field: configuration_node.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.523+01:00", comments="Source field: configuration_node.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.672+01:00", comments="Source field: configuration_node.template") public String getTemplate() { return template; } @@ -74,7 +74,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -97,7 +97,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -124,7 +124,7 @@ public class ConfigurationNodeRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_node * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationRecord.java similarity index 81% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationRecord.java index 1315bdbf..54a6a447 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationRecord.java @@ -1,25 +1,25 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; import org.joda.time.DateTime; public class ConfigurationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.513+01:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.667+01:00", comments="Source field: configuration.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.513+01:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.667+01:00", comments="Source field: configuration.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.515+01:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.667+01:00", comments="Source field: configuration.version") private String version; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.515+01:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.667+01:00", comments="Source field: configuration.version_date") private DateTime versionDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.515+01:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.667+01:00", comments="Source field: configuration.followup") private Integer followup; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.512+01:00", comments="Source Table: configuration") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.667+01:00", comments="Source Table: configuration") public ConfigurationRecord(Long id, Long configurationNodeId, String version, DateTime versionDate, Integer followup) { this.id = id; this.configurationNodeId = configurationNodeId; @@ -28,27 +28,27 @@ public class ConfigurationRecord { this.followup = followup; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.513+01:00", comments="Source field: configuration.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.667+01:00", comments="Source field: configuration.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.513+01:00", comments="Source field: configuration.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.667+01:00", comments="Source field: configuration.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.515+01:00", comments="Source field: configuration.version") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.667+01:00", comments="Source field: configuration.version") public String getVersion() { return version; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.515+01:00", comments="Source field: configuration.version_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.667+01:00", comments="Source field: configuration.version_date") public DateTime getVersionDate() { return versionDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.515+01:00", comments="Source field: configuration.followup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.668+01:00", comments="Source field: configuration.followup") public Integer getFollowup() { return followup; } @@ -57,7 +57,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -78,7 +78,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -103,7 +103,7 @@ public class ConfigurationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationValueRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationValueRecord.java similarity index 81% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationValueRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationValueRecord.java index f8ee3d52..5af89810 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ConfigurationValueRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ConfigurationValueRecord.java @@ -1,27 +1,27 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class ConfigurationValueRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.652+01:00", comments="Source field: configuration_value.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.configuration_id") private Long configurationId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.configuration_attribute_id") private Long configurationAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.list_index") private Integer listIndex; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.value") private String value; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.text") private String text; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source Table: configuration_value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.652+01:00", comments="Source Table: configuration_value") public ConfigurationValueRecord(Long id, Long configurationId, Long configurationAttributeId, Integer listIndex, String value, String text) { this.id = id; this.configurationId = configurationId; @@ -31,32 +31,32 @@ public class ConfigurationValueRecord { this.text = text; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.configuration_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.configuration_id") public Long getConfigurationId() { return configurationId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.configuration_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.configuration_attribute_id") public Long getConfigurationAttributeId() { return configurationAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.list_index") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.list_index") public Integer getListIndex() { return listIndex; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.value") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.value") public String getValue() { return value; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.496+01:00", comments="Source field: configuration_value.text") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.653+01:00", comments="Source field: configuration_value.text") public String getText() { return text; } @@ -65,7 +65,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ConfigurationValueRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table configuration_value * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ExamConfigurationMapRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ExamConfigurationMapRecord.java similarity index 81% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ExamConfigurationMapRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ExamConfigurationMapRecord.java index 18f3d20d..d53df64e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ExamConfigurationMapRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ExamConfigurationMapRecord.java @@ -1,21 +1,21 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class ExamConfigurationMapRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.676+01:00", comments="Source field: exam_configuration_map.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.676+01:00", comments="Source field: exam_configuration_map.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.676+01:00", comments="Source field: exam_configuration_map.configuration_node_id") private Long configurationNodeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.676+01:00", comments="Source field: exam_configuration_map.user_names") private String userNames; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source Table: exam_configuration_map") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.676+01:00", comments="Source Table: exam_configuration_map") public ExamConfigurationMapRecord(Long id, Long examId, Long configurationNodeId, String userNames) { this.id = id; this.examId = examId; @@ -23,22 +23,22 @@ public class ExamConfigurationMapRecord { this.userNames = userNames; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.525+01:00", comments="Source field: exam_configuration_map.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.676+01:00", comments="Source field: exam_configuration_map.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source field: exam_configuration_map.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.676+01:00", comments="Source field: exam_configuration_map.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source field: exam_configuration_map.configuration_node_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.676+01:00", comments="Source field: exam_configuration_map.configuration_node_id") public Long getConfigurationNodeId() { return configurationNodeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.526+01:00", comments="Source field: exam_configuration_map.user_names") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.676+01:00", comments="Source field: exam_configuration_map.user_names") public String getUserNames() { return userNames; } @@ -47,7 +47,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -67,7 +67,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -91,7 +91,7 @@ public class ExamConfigurationMapRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam_configuration_map * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ExamRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ExamRecord.java similarity index 79% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ExamRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ExamRecord.java index a9552865..0d6aad93 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/ExamRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/ExamRecord.java @@ -1,27 +1,27 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class ExamRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.680+01:00", comments="Source field: exam.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.680+01:00", comments="Source field: exam.lms_setup_id") private Long lmsSetupId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source field: exam.external_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.680+01:00", comments="Source field: exam.external_uuid") private String externalUuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.680+01:00", comments="Source field: exam.owner") private String owner; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.681+01:00", comments="Source field: exam.supporter") private String supporter; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.530+01:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.681+01:00", comments="Source field: exam.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source Table: exam") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.680+01:00", comments="Source Table: exam") public ExamRecord(Long id, Long lmsSetupId, String externalUuid, String owner, String supporter, String type) { this.id = id; this.lmsSetupId = lmsSetupId; @@ -31,32 +31,32 @@ public class ExamRecord { this.type = type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source field: exam.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.680+01:00", comments="Source field: exam.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source field: exam.lms_setup_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.680+01:00", comments="Source field: exam.lms_setup_id") public Long getLmsSetupId() { return lmsSetupId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source field: exam.external_uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.680+01:00", comments="Source field: exam.external_uuid") public String getExternalUuid() { return externalUuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source field: exam.owner") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.680+01:00", comments="Source field: exam.owner") public String getOwner() { return owner; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.529+01:00", comments="Source field: exam.supporter") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.681+01:00", comments="Source field: exam.supporter") public String getSupporter() { return supporter; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.530+01:00", comments="Source field: exam.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.681+01:00", comments="Source field: exam.type") public String getType() { return type; } @@ -65,7 +65,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -87,7 +87,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -113,7 +113,7 @@ public class ExamRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table exam * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/IndicatorRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/IndicatorRecord.java similarity index 79% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/IndicatorRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/IndicatorRecord.java index eec8e7e8..3db36bec 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/IndicatorRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/IndicatorRecord.java @@ -1,24 +1,24 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class IndicatorRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source field: indicator.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source field: indicator.exam_id") private Long examId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source field: indicator.type") private String type; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source field: indicator.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source field: indicator.color") private String color; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.541+01:00", comments="Source Table: indicator") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source Table: indicator") public IndicatorRecord(Long id, Long examId, String type, String name, String color) { this.id = id; this.examId = examId; @@ -27,27 +27,27 @@ public class IndicatorRecord { this.color = color; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source field: indicator.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.exam_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source field: indicator.exam_id") public Long getExamId() { return examId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source field: indicator.type") public String getType() { return type; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source field: indicator.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.542+01:00", comments="Source field: indicator.color") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.694+01:00", comments="Source field: indicator.color") public String getColor() { return color; } @@ -56,7 +56,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -77,7 +77,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -102,7 +102,7 @@ public class IndicatorRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table indicator * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/InstitutionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/InstitutionRecord.java similarity index 79% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/InstitutionRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/InstitutionRecord.java index 416defcf..b122b492 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/InstitutionRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/InstitutionRecord.java @@ -1,35 +1,35 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class InstitutionRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.545+01:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.697+01:00", comments="Source field: institution.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.545+01:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.697+01:00", comments="Source field: institution.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.545+01:00", comments="Source field: institution.authtype") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.697+01:00", comments="Source field: institution.authtype") private String authtype; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.545+01:00", comments="Source Table: institution") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.697+01:00", comments="Source Table: institution") public InstitutionRecord(Long id, String name, String authtype) { this.id = id; this.name = name; this.authtype = authtype; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.545+01:00", comments="Source field: institution.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.697+01:00", comments="Source field: institution.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.545+01:00", comments="Source field: institution.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.697+01:00", comments="Source field: institution.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.545+01:00", comments="Source field: institution.authtype") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.698+01:00", comments="Source field: institution.authtype") public String getAuthtype() { return authtype; } @@ -38,7 +38,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -57,7 +57,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -80,7 +80,7 @@ public class InstitutionRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table institution * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/OrientationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/OrientationRecord.java similarity index 80% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/OrientationRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/OrientationRecord.java index f6d0d1ad..51da8771 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/OrientationRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/OrientationRecord.java @@ -1,36 +1,36 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class OrientationRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.658+01:00", comments="Source field: orientation.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.658+01:00", comments="Source field: orientation.config_attribute_id") private Long configAttributeId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.template") private String template; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.view") private String view; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.group") private String group; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.x_position") private Integer xPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.y_position") private Integer yPosition; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.width") private Integer width; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.504+01:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.height") private Integer height; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source Table: orientation") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.658+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) { this.id = id; this.configAttributeId = configAttributeId; @@ -43,47 +43,47 @@ public class OrientationRecord { this.height = height; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.658+01:00", comments="Source field: orientation.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.config_attribute_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.658+01:00", comments="Source field: orientation.config_attribute_id") public Long getConfigAttributeId() { return configAttributeId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.template") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.template") public String getTemplate() { return template; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.view") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.view") public String getView() { return view; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.group") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.group") public String getGroup() { return group; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.x_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.x_position") public Integer getxPosition() { return xPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.y_position") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.y_position") public Integer getyPosition() { return yPosition; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.503+01:00", comments="Source field: orientation.width") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.width") public Integer getWidth() { return width; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.504+01:00", comments="Source field: orientation.height") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.659+01:00", comments="Source field: orientation.height") public Integer getHeight() { return height; } @@ -92,7 +92,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -117,7 +117,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -146,7 +146,7 @@ public class OrientationRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table orientation * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/RoleRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/RoleRecord.java similarity index 79% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/RoleRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/RoleRecord.java index 9cb95523..f8fd1d76 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/RoleRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/RoleRecord.java @@ -1,35 +1,35 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class RoleRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.711+01:00", comments="Source field: user_role.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.711+01:00", comments="Source field: user_role.user_id") private Long userId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.711+01:00", comments="Source field: user_role.role_name") private String roleName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source Table: user_role") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.711+01:00", comments="Source Table: user_role") public RoleRecord(Long id, Long userId, String roleName) { this.id = id; this.userId = userId; this.roleName = roleName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source field: user_role.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.711+01:00", comments="Source field: user_role.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source field: user_role.user_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.711+01:00", comments="Source field: user_role.user_id") public Long getUserId() { return userId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.554+01:00", comments="Source field: user_role.role_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.711+01:00", comments="Source field: user_role.role_name") public String getRoleName() { return roleName; } @@ -38,7 +38,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -57,7 +57,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -80,7 +80,7 @@ public class RoleRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user_role * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/SebLmsSetupRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/SebLmsSetupRecord.java similarity index 81% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/SebLmsSetupRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/SebLmsSetupRecord.java index 982a8ec3..9a03fe2e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/SebLmsSetupRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/SebLmsSetupRecord.java @@ -1,39 +1,39 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; public class SebLmsSetupRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source field: seb_lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.700+01:00", comments="Source field: seb_lms_setup.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source field: seb_lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.700+01:00", comments="Source field: seb_lms_setup.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source field: seb_lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.700+01:00", comments="Source field: seb_lms_setup.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source field: seb_lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.lms_type") private String lmsType; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.lms_url") private String lmsUrl; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.lms_clientname") private String lmsClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.lms_clientsecret") private String lmsClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.lms_rest_api_token") private String lmsRestApiToken; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.seb_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.seb_clientname") private String sebClientname; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.seb_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.seb_clientsecret") private String sebClientsecret; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source Table: seb_lms_setup") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.700+01:00", comments="Source Table: seb_lms_setup") public SebLmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String sebClientname, String sebClientsecret) { this.id = id; this.institutionId = institutionId; @@ -47,52 +47,52 @@ public class SebLmsSetupRecord { this.sebClientsecret = sebClientsecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source field: seb_lms_setup.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.700+01:00", comments="Source field: seb_lms_setup.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source field: seb_lms_setup.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.700+01:00", comments="Source field: seb_lms_setup.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source field: seb_lms_setup.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.547+01:00", comments="Source field: seb_lms_setup.lms_type") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.lms_type") public String getLmsType() { return lmsType; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.lms_url") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.lms_url") public String getLmsUrl() { return lmsUrl; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.lms_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.lms_clientname") public String getLmsClientname() { return lmsClientname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.lms_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.lms_clientsecret") public String getLmsClientsecret() { return lmsClientsecret; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.lms_rest_api_token") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.lms_rest_api_token") public String getLmsRestApiToken() { return lmsRestApiToken; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.seb_clientname") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.seb_clientname") public String getSebClientname() { return sebClientname; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.548+01:00", comments="Source field: seb_lms_setup.seb_clientsecret") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.701+01:00", comments="Source field: seb_lms_setup.seb_clientsecret") public String getSebClientsecret() { return sebClientsecret; } @@ -101,7 +101,7 @@ public class SebLmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_lms_setup * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -127,7 +127,7 @@ public class SebLmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_lms_setup * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -157,7 +157,7 @@ public class SebLmsSetupRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table seb_lms_setup * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/UserRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/UserRecord.java similarity index 79% rename from src/main/java/ch/ethz/seb/sebserver/ws/batis/model/UserRecord.java rename to src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/UserRecord.java index 37fed70b..9c5c9eab 100644 --- a/src/main/java/ch/ethz/seb/sebserver/ws/batis/model/UserRecord.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/batis/model/UserRecord.java @@ -1,43 +1,43 @@ -package ch.ethz.seb.sebserver.ws.batis.model; +package ch.ethz.seb.sebserver.webservice.batis.model; import javax.annotation.Generated; import org.joda.time.DateTime; public class UserRecord { - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.705+01:00", comments="Source field: user.id") private Long id; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.institution_id") private Long institutionId; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.uuid") private String uuid; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.name") private String name; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.user_name") private String userName; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.password") private String password; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.email") private String email; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.creation_date") private DateTime creationDate; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.active") private Integer active; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.locale") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.locale") private String locale; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.timezone") private String timezone; - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source Table: user") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.705+01:00", comments="Source Table: user") public UserRecord(Long id, Long institutionId, String uuid, String name, String userName, String password, String email, DateTime creationDate, Integer active, String locale, String timezone) { this.id = id; this.institutionId = institutionId; @@ -52,57 +52,57 @@ public class UserRecord { this.timezone = timezone; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source field: user.id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.705+01:00", comments="Source field: user.id") public Long getId() { return id; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source field: user.institution_id") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.institution_id") public Long getInstitutionId() { return institutionId; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source field: user.uuid") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.uuid") public String getUuid() { return uuid; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.550+01:00", comments="Source field: user.name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.name") public String getName() { return name; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.user_name") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.user_name") public String getUserName() { return userName; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.password") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.password") public String getPassword() { return password; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.email") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.email") public String getEmail() { return email; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.creation_date") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.creation_date") public DateTime getCreationDate() { return creationDate; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.active") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.active") public Integer getActive() { return active; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.locale") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.locale") public String getLocale() { return locale; } - @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-12T16:16:23.551+01:00", comments="Source field: user.timezone") + @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2018-11-14T08:29:18.706+01:00", comments="Source field: user.timezone") public String getTimezone() { return timezone; } @@ -111,7 +111,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public String toString() { @@ -138,7 +138,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public boolean equals(Object that) { @@ -169,7 +169,7 @@ public class UserRecord { * This method was generated by MyBatis Generator. * This method corresponds to the database table user * - * @mbg.generated Mon Nov 12 16:16:23 CET 2018 + * @mbg.generated Wed Nov 14 08:29:18 CET 2018 */ @Override public int hashCode() { diff --git a/src/main/resources/.gitignore b/src/main/resources/.gitignore new file mode 100644 index 00000000..64d7f6e9 --- /dev/null +++ b/src/main/resources/.gitignore @@ -0,0 +1 @@ +/data-dev.sql diff --git a/src/main/resources/config/.gitignore b/src/main/resources/config/.gitignore new file mode 100644 index 00000000..065fbb36 --- /dev/null +++ b/src/main/resources/config/.gitignore @@ -0,0 +1,3 @@ +/application-prod-gui.properties +/application-prod-ws.properties +/application-prod.properties diff --git a/src/main/resources/config/application-dev-gui.properties b/src/main/resources/config/application-dev-gui.properties new file mode 100644 index 00000000..8f91c79e --- /dev/null +++ b/src/main/resources/config/application-dev-gui.properties @@ -0,0 +1,3 @@ +server.port=8080 + + diff --git a/src/main/resources/config/application-dev-ws.properties b/src/main/resources/config/application-dev-ws.properties new file mode 100644 index 00000000..499d496a --- /dev/null +++ b/src/main/resources/config/application-dev-ws.properties @@ -0,0 +1,7 @@ +spring.datasource.initialize=true +spring.datasource.initialization-mode=always +spring.datasource.url=jdbc:mariadb://localhost:6603/SEBServer?useSSL=false&createDatabaseIfNotExist=true +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver +spring.datasource.platform=dev + +server.port=8090 \ No newline at end of file diff --git a/src/main/resources/config/application-dev.properties b/src/main/resources/config/application-dev.properties new file mode 100644 index 00000000..07b206e5 --- /dev/null +++ b/src/main/resources/config/application-dev.properties @@ -0,0 +1,5 @@ +spring.profiles.include=dev-ws,dev-gui + +server.address=localhost +server.port=8080 +server.servlet.context-path=/ diff --git a/src/main/resources/config/application-test.properties b/src/main/resources/config/application-test.properties new file mode 100644 index 00000000..864e1a77 --- /dev/null +++ b/src/main/resources/config/application-test.properties @@ -0,0 +1,3 @@ +TODO + + diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties new file mode 100644 index 00000000..b168ef5e --- /dev/null +++ b/src/main/resources/config/application.properties @@ -0,0 +1,2 @@ +spring.application.name=SEB Server +spring.profiles.active=dev \ No newline at end of file diff --git a/src/main/resources/config/schema.sql b/src/main/resources/config/schema.sql new file mode 100644 index 00000000..47330fe0 --- /dev/null +++ b/src/main/resources/config/schema.sql @@ -0,0 +1,377 @@ +-- ----------------------------------------------------- +-- Schema SEBServer +-- ----------------------------------------------------- +DROP DATABASE IF EXISTS SEBServer; +CREATE DATABASE IF NOT EXISTS SEBServer; +use SEBServer; + +-- ----------------------------------------------------- +-- Table `institution` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `institution` ; + +CREATE TABLE IF NOT EXISTS `institution` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `name` VARCHAR(255) NOT NULL, + `authType` VARCHAR(45) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `name_UNIQUE` (`name` ASC)) +; + + +-- ----------------------------------------------------- +-- Table `seb_lms_setup` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `seb_lms_setup` ; + +CREATE TABLE IF NOT EXISTS `seb_lms_setup` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `institution_id` BIGINT UNSIGNED NOT NULL, + `name` VARCHAR(255) NOT NULL, + `lms_type` VARCHAR(45) NOT NULL, + `lms_url` VARCHAR(255) NULL, + `lms_clientname` VARCHAR(255) NOT NULL, + `lms_clientsecret` VARCHAR(255) NOT NULL, + `lms_rest_api_token` VARCHAR(4000) NULL, + `seb_clientname` VARCHAR(255) NOT NULL, + `seb_clientsecret` VARCHAR(255) NOT NULL, + PRIMARY KEY (`id`), + INDEX `setupInstitutionRef_idx` (`institution_id` ASC), + CONSTRAINT `setupInstitutionRef` + FOREIGN KEY (`institution_id`) + REFERENCES `institution` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `exam` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `exam` ; + +CREATE TABLE IF NOT EXISTS `exam` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `lms_setup_id` BIGINT UNSIGNED NOT NULL, + `external_uuid` VARCHAR(255) NOT NULL, + `owner` VARCHAR(255) NOT NULL, + `supporter` VARCHAR(4000) NULL COMMENT 'comma separated list of user_uuid', + `type` VARCHAR(45) NOT NULL, + PRIMARY KEY (`id`), + INDEX `lms_setup_key_idx` (`lms_setup_id` ASC), + CONSTRAINT `lms_setup_key` + FOREIGN KEY (`lms_setup_id`) + REFERENCES `seb_lms_setup` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `client_connection` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `client_connection` ; + +CREATE TABLE IF NOT EXISTS `client_connection` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `exam_id` BIGINT UNSIGNED NULL, + `status` VARCHAR(45) NOT NULL, + `connection_token` VARCHAR(255) NOT NULL, + `user_name` VARCHAR(255) NOT NULL, + `VDI` BIT(1) NOT NULL, + `client_address` VARCHAR(45) NOT NULL, + `virtual_client_address` VARCHAR(45) NULL, + PRIMARY KEY (`id`), + INDEX `connection_exam_ref_idx` (`exam_id` ASC), + CONSTRAINT `clientConnectionExamRef` + FOREIGN KEY (`exam_id`) + REFERENCES `exam` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `client_event` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `client_event` ; + +CREATE TABLE IF NOT EXISTS `client_event` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `connection_id` BIGINT UNSIGNED NOT NULL, + `user_identifier` VARCHAR(255) NOT NULL, + `type` INT(2) UNSIGNED NOT NULL, + `timestamp` BIGINT UNSIGNED NOT NULL, + `numeric_value` DECIMAL(10,4) NULL, + `text` VARCHAR(255) NULL, + PRIMARY KEY (`id`), + INDEX `eventConnectionRef_idx` (`connection_id` ASC), + CONSTRAINT `eventConnectionRef` + FOREIGN KEY (`connection_id`) + REFERENCES `client_connection` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `indicator` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `indicator` ; + +CREATE TABLE IF NOT EXISTS `indicator` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `exam_id` BIGINT UNSIGNED NOT NULL, + `type` VARCHAR(45) NOT NULL, + `name` VARCHAR(45) NOT NULL, + `color` VARCHAR(45) NOT NULL, + INDEX `indicator_exam_idx` (`exam_id` ASC), + PRIMARY KEY (`id`), + CONSTRAINT `exam_ref` + FOREIGN KEY (`exam_id`) + REFERENCES `exam` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `configuration_node` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `configuration_node` ; + +CREATE TABLE IF NOT EXISTS `configuration_node` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `institution_id` BIGINT UNSIGNED NOT NULL, + `owner` VARCHAR(255) NOT NULL, + `name` VARCHAR(255) NOT NULL, + `description` VARCHAR(4000) NULL, + `type` VARCHAR(45) NULL, + `template` VARCHAR(255) NULL, + PRIMARY KEY (`id`), + INDEX `configurationInstitutionRef_idx` (`institution_id` ASC), + CONSTRAINT `configurationInstitutionRef` + FOREIGN KEY (`institution_id`) + REFERENCES `institution` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `configuration` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `configuration` ; + +CREATE TABLE IF NOT EXISTS `configuration` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `configuration_node_id` BIGINT UNSIGNED NOT NULL, + `version` VARCHAR(255) NULL, + `version_date` DATETIME NULL, + `followup` INT(1) NOT NULL, + PRIMARY KEY (`id`), + INDEX `configurationNodeRef_idx` (`configuration_node_id` ASC), + CONSTRAINT `configurationNodeRef` + FOREIGN KEY (`configuration_node_id`) + REFERENCES `configuration_node` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `configuration_attribute` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `configuration_attribute` ; + +CREATE TABLE IF NOT EXISTS `configuration_attribute` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `name` VARCHAR(45) NOT NULL, + `type` VARCHAR(45) NOT NULL, + `parent_id` BIGINT UNSIGNED NULL, + `resources` VARCHAR(255) NULL, + `validator` VARCHAR(45) NULL, + `dependencies` VARCHAR(255) NULL, + `default_value` VARCHAR(255) NULL, + PRIMARY KEY (`id`), + INDEX `parent_ref_idx` (`parent_id` ASC), + CONSTRAINT `parent_ref` + FOREIGN KEY (`parent_id`) + REFERENCES `configuration_attribute` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `configuration_value` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `configuration_value` ; + +CREATE TABLE IF NOT EXISTS `configuration_value` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `configuration_id` BIGINT UNSIGNED NOT NULL, + `configuration_attribute_id` BIGINT UNSIGNED NOT NULL, + `list_index` INT NOT NULL DEFAULT 0, + `value` VARCHAR(255) NULL, + `text` MEDIUMTEXT NULL, + PRIMARY KEY (`id`), + INDEX `configuration_value_ref_idx` (`configuration_id` ASC), + INDEX `configuration_attribute_ref_idx` (`configuration_attribute_id` ASC), + CONSTRAINT `configuration_ref` + FOREIGN KEY (`configuration_id`) + REFERENCES `configuration` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION, + CONSTRAINT `configuration_value_attribute_ref` + FOREIGN KEY (`configuration_attribute_id`) + REFERENCES `configuration_attribute` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `orientation` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `orientation` ; + +CREATE TABLE IF NOT EXISTS `orientation` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `config_attribute_id` BIGINT UNSIGNED NOT NULL, + `template` VARCHAR(255) NULL, + `view` VARCHAR(45) NOT NULL, + `group` VARCHAR(45) NULL, + `x_position` INT UNSIGNED NOT NULL DEFAULT 0, + `y_position` INT UNSIGNED NOT NULL DEFAULT 0, + `width` INT UNSIGNED NULL, + `height` INT UNSIGNED NULL, + PRIMARY KEY (`id`), + INDEX `config_attribute_orientation_rev_idx` (`config_attribute_id` ASC), + CONSTRAINT `config_attribute_orientation_rev` + FOREIGN KEY (`config_attribute_id`) + REFERENCES `configuration_attribute` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `exam_configuration_map` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `exam_configuration_map` ; + +CREATE TABLE IF NOT EXISTS `exam_configuration_map` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `exam_id` BIGINT UNSIGNED NOT NULL, + `configuration_node_id` BIGINT UNSIGNED NOT NULL, + `user_names` VARCHAR(4000) NULL, + PRIMARY KEY (`id`), + INDEX `exam_ref_idx` (`exam_id` ASC), + INDEX `configuration_map_ref_idx` (`configuration_node_id` ASC), + CONSTRAINT `exam_map_ref` + FOREIGN KEY (`exam_id`) + REFERENCES `exam` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION, + CONSTRAINT `configuration_map_ref` + FOREIGN KEY (`configuration_node_id`) + REFERENCES `configuration_node` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `user` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `user` ; + +CREATE TABLE IF NOT EXISTS `user` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `institution_id` BIGINT UNSIGNED NULL, + `uuid` VARCHAR(255) NOT NULL, + `name` VARCHAR(255) NOT NULL, + `user_name` VARCHAR(255) NOT NULL, + `password` VARCHAR(255) NOT NULL, + `email` VARCHAR(255) NOT NULL, + `creation_date` DATETIME NOT NULL, + `active` INT(1) NOT NULL, + `locale` VARCHAR(45) NOT NULL, + `timeZone` VARCHAR(45) NOT NULL, + PRIMARY KEY (`id`), + INDEX `institutionRef_idx` (`institution_id` ASC), + CONSTRAINT `institutionRef` + FOREIGN KEY (`institution_id`) + REFERENCES `institution` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `user_role` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `user_role` ; + +CREATE TABLE IF NOT EXISTS `user_role` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `user_id` BIGINT UNSIGNED NOT NULL, + `role_name` VARCHAR(45) NOT NULL, + PRIMARY KEY (`id`), + INDEX `user_ref_idx` (`user_id` ASC), + CONSTRAINT `user_ref` + FOREIGN KEY (`user_id`) + REFERENCES `user` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + + +-- ----------------------------------------------------- +-- Table `oauth_access_token` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `oauth_access_token` ; + +CREATE TABLE IF NOT EXISTS `oauth_access_token` ( + `token_id` VARCHAR(255) NULL, + `token` BLOB NULL, + `authentication_id` VARCHAR(255) NULL, + `user_name` VARCHAR(255) NULL, + `client_id` VARCHAR(255) NULL, + `authentication` BLOB NULL, + `refresh_token` VARCHAR(255) NULL) +; + + +-- ----------------------------------------------------- +-- Table `oauth_refresh_token` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `oauth_refresh_token` ; + +CREATE TABLE IF NOT EXISTS `oauth_refresh_token` ( + `token_id` VARCHAR(255) NULL, + `token` BLOB NULL, + `authentication` BLOB NULL) +; + + +-- ----------------------------------------------------- +-- Table `threshold` +-- ----------------------------------------------------- +DROP TABLE IF EXISTS `threshold` ; + +CREATE TABLE IF NOT EXISTS `threshold` ( + `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + `indicator_id` BIGINT UNSIGNED NOT NULL, + `value` DECIMAL(10,4) NOT NULL, + `color` VARCHAR(45) NOT NULL, + PRIMARY KEY (`id`), + INDEX `indicator_threshold_id_idx` (`indicator_id` ASC), + CONSTRAINT `indicator_threshold_id` + FOREIGN KEY (`indicator_id`) + REFERENCES `indicator` (`id`) + ON DELETE NO ACTION + ON UPDATE NO ACTION) +; + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 00000000..1be5cd9a --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,20 @@ + + + + + %d{HH:mm:ss.SSS} %-5level [%thread]:[%logger] %msg%n + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/ch/ethz/seb/sebserver/ws/batis/JodaTimeTypeResolverTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/batis/JodaTimeTypeResolverTest.java similarity index 94% rename from src/test/java/ch/ethz/seb/sebserver/ws/batis/JodaTimeTypeResolverTest.java rename to src/test/java/ch/ethz/seb/sebserver/webservice/batis/JodaTimeTypeResolverTest.java index a060a1af..cbec583d 100644 --- a/src/test/java/ch/ethz/seb/sebserver/ws/batis/JodaTimeTypeResolverTest.java +++ b/src/test/java/ch/ethz/seb/sebserver/webservice/batis/JodaTimeTypeResolverTest.java @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package ch.ethz.seb.sebserver.ws.batis; +package ch.ethz.seb.sebserver.webservice.batis; import static org.junit.Assert.*; import static org.mockito.ArgumentMatchers.any; @@ -24,7 +24,8 @@ import org.joda.time.DateTimeZone; import org.junit.Test; import org.mockito.Mockito; -import ch.ethz.seb.sebserver.Constants; +import ch.ethz.seb.sebserver.gbl.Constants; +import ch.ethz.seb.sebserver.webservice.batis.JodaTimeTypeResolver; public class JodaTimeTypeResolverTest {