From dda39f2d53a1fe4727b2978635488e3081849e22 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Tue, 3 Jan 2023 20:48:08 +0100 Subject: [PATCH] Try to solve the test --- .../entities/database/table/columns/concepts/Concept.java | 1 - .../entities/database/table/columns/concepts/Unit.java | 4 ++-- .../rest-service/src/test/resources/application.properties | 6 +++--- .../rest-service/src/test/resources/application.properties | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java index 9d38c1d557..1771719c74 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java @@ -2,7 +2,6 @@ package at.tuwien.entities.database.table.columns.concepts; import at.tuwien.entities.database.table.columns.TableColumn; import lombok.*; -import org.hibernate.annotations.GenericGenerator; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Unit.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Unit.java index 5b673b4d99..699cdf7d89 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Unit.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Unit.java @@ -12,12 +12,12 @@ import java.util.List; @Data @Entity @Builder +@ToString @AllArgsConstructor @NoArgsConstructor -@ToString @EntityListeners(AuditingEntityListener.class) @EqualsAndHashCode(onlyExplicitlyIncluded = true) -@Table(name = "mdb_units") +@javax.persistence.Table(name = "mdb_units") public class Unit { @Id diff --git a/fda-query-service/rest-service/src/test/resources/application.properties b/fda-query-service/rest-service/src/test/resources/application.properties index 8f5bf19d03..550589215a 100644 --- a/fda-query-service/rest-service/src/test/resources/application.properties +++ b/fda-query-service/rest-service/src/test/resources/application.properties @@ -2,11 +2,11 @@ spring.profiles.active=local # disable discovery -spring.cloud.discovery.enabled=false +spring.cloud.discovery.enabled = false # disable cloud config and config discovery -spring.cloud.config.discovery.enabled=false -spring.cloud.config.enabled=false +spring.cloud.config.discovery.enabled = false +spring.cloud.config.enabled = false # internal datasource spring.datasource.url=jdbc:h2:mem:testdb;DATABASE_TO_UPPER=false;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM './src/test/resources/init.sql' diff --git a/fda-table-service/rest-service/src/test/resources/application.properties b/fda-table-service/rest-service/src/test/resources/application.properties index 7fb1d2e41f..ef996777c5 100644 --- a/fda-table-service/rest-service/src/test/resources/application.properties +++ b/fda-table-service/rest-service/src/test/resources/application.properties @@ -20,4 +20,4 @@ spring.jpa.properties.hibernate.hbm2ddl.schema_filter_provider=at.tuwien.hiberna # additional logging logging.level.org.hibernate.SQL=debug -logging.level.org.hibernate.type=warn \ No newline at end of file +logging.level.org.hibernate.type=trace \ No newline at end of file -- GitLab