Merge "Introduce new entities"

1 files changed, 16 insertions, 1 deletions

diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index f41b68dfb..16331ba08 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -63,6 +63,7 @@ server.port=${clamp.it.tests.http}
 server.servlet.context-path=/

 #Modified engine-rest applicationpath

 spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller

+spring.http.converters.preferred-json-mapper=gson

 

 #The max number of active threads in this pool

 server.tomcat.max-threads=200

@@ -90,7 +91,7 @@ camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
 

 #clds datasource connection details

 spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver

-spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3

+spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:3306,localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3

 spring.datasource.cldsdb.username=clds

 spring.datasource.cldsdb.password=4c90a0b48204383f4283448d23e0b885a47237b2a23588e7c4651604f51c1067

 spring.datasource.cldsdb.validationQuery=SELECT 1

@@ -103,6 +104,20 @@ spring.datasource.cldsdb.initialSize=0
 spring.datasource.cldsdb.testOnBorrow=true

 spring.datasource.cldsdb.ignoreExceptionOnPreLoad=true

 

+spring.jpa.properties.javax.persistence.schema-generation.database.action=none
+#spring.jpa.properties.javax.persistence.schema-generation.create-source=metadata
+#spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create
+#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-target=create.sql
+# disable Hibernate DDL generation because the schema will be generated from a sql script
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.properties.hibernate.ddl-auto=validate
+spring.jpa.properties.hibernate.hbm2ddl.delimiter=;
+spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.properties.hibernate.use-new-id-generator-mappings=true
+
+# Whether to enable logging of SQL statements.
+spring.jpa.show-sql=true
+
 #Async Executor default Parameters

 async.core.pool.size=10

 async.max.pool.size=20