fixed startup

docker/demo/docker-compose.yml

@@ -14,8 +14,8 @@ services:
       build:
           context: .
           args:
-              - GIT_TAG=
+              - GIT_TAG=v0.4.1-beta
-              - SEBSERVER_VERSION=0.4.0-SNAPSHOT
+              - SEBSERVER_VERSION=0.4.1-SNAPSHOT
       container_name: seb-server
       environment:
           - SERVER_ADDRESS=0.0.0.0

src/main/java/ch/ethz/seb/sebserver/SEBServer.java

@@ -12,9 +12,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Import;
-
-import ch.ethz.seb.sebserver.webservice.datalayer.batis.BatisConfig;
 
 /** SEB-Server (Safe Exam Browser Server) is a server component to maintain and support
  * Exams running with SEB (Safe Exam Browser). TODO add link(s)
@@ -35,7 +32,6 @@ import ch.ethz.seb.sebserver.webservice.datalayer.batis.BatisConfig;
         UserDetailsServiceAutoConfiguration.class,
 })
 @EnableCaching
-@Import(BatisConfig.class)
 public class SEBServer {
 
     public static void main(final String[] args) {

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

@@ -18,6 +18,7 @@ import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.transaction.annotation.Transactional;
 
 import ch.ethz.seb.sebserver.gbl.api.EntityType;
@@ -32,6 +33,7 @@ import ch.ethz.seb.sebserver.gbl.util.Utils;
  *
  * @param <T> The specific type of the Entity domain model
  * @param <M> The specific type of the Entity domain model to create a new Entity */
+@DependsOn("batisConfig")
 public interface EntityDAO<T extends Entity, M extends ModelIdAware> {
 
     Logger log = LoggerFactory.getLogger(EntityDAO.class);

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

@@ -25,6 +25,7 @@ import org.mybatis.spring.SqlSessionTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
@@ -55,11 +56,12 @@ import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ConfigurationRecor
 import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.ConfigurationValueRecord;
 import ch.ethz.seb.sebserver.webservice.servicelayer.dao.ResourceNotFoundException;
 
+/** This service is internally used to implement MyBatis batch functionality for the most
+ * intensive write operation on Configuration domain. */
 @Lazy
 @Component
 @WebServiceProfile
-/** This service is internally used to implement MyBatis batch functionality for the most
+@DependsOn("batisConfig")
- * intensive write operation on Configuration domain. */
 class ConfigurationDAOBatchService {
 
     private static final Logger log = LoggerFactory.getLogger(ConfigurationDAOBatchService.class);