From e023834cae31a5cdc58c941daf267817866a5c68 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 11 May 2023 12:27:22 +0200
Subject: [PATCH] Fixed the tests after ~8h
---
.../service/PersistenceIntegrationTest.java | 5 ++--
.../src/test/resources/application.properties | 2 +-
.../tuwien/service/impl/ImageServiceImpl.java | 3 +++
.../endpoint/AccessEndpointUnitTest.java | 1 +
.../endpoint/DatabaseEndpointUnitTest.java | 2 ++
.../endpoint/LicenseEndpointUnitTest.java | 1 +
.../service/AccessServiceIntegrationTest.java | 4 ---
.../service/DatabaseServiceComponentTest.java | 2 --
.../src/test/resources/application.properties | 2 +-
.../src/test/resources/schema.sql | 25 -------------------
.../database/table/columns/TableColumn.java | 4 +--
.../table/columns/TableColumnConcept.java | 3 +++
.../table/columns/TableColumnUnit.java | 15 +++--------
.../endpoints/MetadataEndpointUnitTest.java | 9 -------
.../IdentifierServiceIntegrationTest.java | 5 ----
.../MetadataServiceIntegrationTest.java | 5 ----
.../src/test/resources/schema.sql | 25 -------------------
.../RabbitMqListenerIntegrationTest.java | 1 -
.../ViewRepositoryIntegrationTest.java | 1 -
.../TableServiceIntegrationReadTest.java | 2 --
.../src/test/resources/application.properties | 2 +-
.../src/test/resources/schema.sql | 25 -------------------
.../TableEndpointIntegrationTest.java | 1 -
.../TableServiceIntegrationReadTest.java | 1 -
.../TableServiceIntegrationWriteTest.java | 1 -
.../src/test/resources/application.properties | 2 +-
.../src/test/resources/schema.sql | 20 ---------------
.../at/tuwien/config/WebSecurityConfig.java | 1 -
.../src/test/resources/application.properties | 2 +-
.../src/test/resources/schema.sql | 25 -------------------
.../at/tuwien/config/WebSecurityConfig.java | 1 -
31 files changed, 23 insertions(+), 175 deletions(-)
delete mode 100644 dbrepo-database-service/rest-service/src/test/resources/schema.sql
delete mode 100644 dbrepo-metadata-service/rest-service/src/test/resources/schema.sql
delete mode 100644 dbrepo-query-service/rest-service/src/test/resources/schema.sql
delete mode 100644 dbrepo-table-service/rest-service/src/test/resources/schema.sql
delete mode 100644 dbrepo-user-service/rest-service/src/test/resources/schema.sql
diff --git a/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/PersistenceIntegrationTest.java b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/PersistenceIntegrationTest.java
index 57a97cf3ae..d7b341c23a 100644
--- a/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/PersistenceIntegrationTest.java
+++ b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/service/PersistenceIntegrationTest.java
@@ -2,6 +2,7 @@ package at.tuwien.service;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.ReadyConfig;
+import at.tuwien.exception.ImageNotFoundException;
import at.tuwien.repository.jpa.ImageRepository;
import at.tuwien.repository.jpa.UserRepository;
import at.tuwien.service.impl.ImageServiceImpl;
@@ -46,8 +47,8 @@ public class PersistenceIntegrationTest extends BaseUnitTest {
public void delete_notExists_fails() {
/* test */
- assertThrows(UnexpectedRollbackException.class, () -> {
- imageService.delete(IMAGE_2_ID);
+ assertThrows(ImageNotFoundException.class, () -> {
+ imageService.delete(9999L);
});
}
diff --git a/dbrepo-container-service/rest-service/src/test/resources/application.properties b/dbrepo-container-service/rest-service/src/test/resources/application.properties
index 864c870f6e..246afd9369 100644
--- a/dbrepo-container-service/rest-service/src/test/resources/application.properties
+++ b/dbrepo-container-service/rest-service/src/test/resources/application.properties
@@ -10,7 +10,7 @@ spring.cloud.config.enabled = false
# disable datasource
# spring 6 fix https://github.com/h2database/h2database/issues/3363
-spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
+spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE,KEY;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
diff --git a/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java b/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java
index fa1de29edb..d1cf69056a 100644
--- a/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java
+++ b/dbrepo-container-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java
@@ -126,6 +126,9 @@ public class ImageServiceImpl implements ImageService {
@Override
@Transactional
public void delete(Long imageId) throws ImageNotFoundException {
+ if (!imageRepository.existsById(imageId)) {
+ throw new ImageNotFoundException("Image with id " + imageId + " not found");
+ }
try {
imageRepository.deleteById(imageId);
log.info("Deleted image {}", imageId);
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
index 68b5a0c1c2..ac03038159 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
@@ -27,6 +27,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.test.context.support.WithAnonymousUser;
import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.security.Principal;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java
index d73873ade4..c32330b76d 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.api.database.*;
+import at.tuwien.config.H2Utils;
import at.tuwien.config.IndexConfig;
import at.tuwien.config.ReadyConfig;
import at.tuwien.endpoints.DatabaseEndpoint;
@@ -27,6 +28,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
import org.springframework.security.test.context.support.WithAnonymousUser;
import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.security.Principal;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java
index 81673c913a..b102cbf851 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java
@@ -16,6 +16,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.List;
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
index 5c9a0bbdce..bcb86edb33 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
@@ -71,9 +71,6 @@ public class AccessServiceIntegrationTest extends BaseUnitTest {
@Autowired
private RealmRepository realmRepository;
- @Autowired
- private H2Utils h2Utils;
-
private final static String BIND_WEATHER = new File("../../dbrepo-metadata-db/test/src/test/resources/weather").toPath().toAbsolutePath() + ":/docker-entrypoint-initdb.d";
@BeforeAll
@@ -93,7 +90,6 @@ public class AccessServiceIntegrationTest extends BaseUnitTest {
afterEach();
DockerConfig.createAllNetworks();
/* metadata database */
- h2Utils.runScript("schema.sql");
realmRepository.save(REALM_DBREPO);
imageRepository.save(IMAGE_1);
userRepository.save(USER_1_SIMPLE);
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java
index f1a930c9f3..ab7659a86f 100644
--- a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceComponentTest.java
@@ -78,8 +78,6 @@ public class DatabaseServiceComponentTest extends BaseUnitTest {
@BeforeEach
public void beforeEach() {
afterEach();
- /* metadata database */
- h2Utils.runScript("schema.sql");
}
@AfterEach
diff --git a/dbrepo-database-service/rest-service/src/test/resources/application.properties b/dbrepo-database-service/rest-service/src/test/resources/application.properties
index 857d45f763..2387763b3a 100644
--- a/dbrepo-database-service/rest-service/src/test/resources/application.properties
+++ b/dbrepo-database-service/rest-service/src/test/resources/application.properties
@@ -10,7 +10,7 @@ spring.cloud.config.enabled=false
# disable datasource
# spring 6 fix https://github.com/h2database/h2database/issues/3363
-spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
+spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE,KEY;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
diff --git a/dbrepo-database-service/rest-service/src/test/resources/schema.sql b/dbrepo-database-service/rest-service/src/test/resources/schema.sql
deleted file mode 100644
index 906d8df808..0000000000
--- a/dbrepo-database-service/rest-service/src/test/resources/schema.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE SCHEMA IF NOT EXISTS `fda`;
-SET SCHEMA `fda`;
-DROP TABLE IF EXISTS fda.mdb_concepts;
-CREATE TABLE IF NOT EXISTS fda.mdb_concepts
-(
- uri VARCHAR(500) not null,
- name VARCHAR(255),
- created timestamp NOT NULL DEFAULT NOW(),
- created_by bigint,
- PRIMARY KEY (uri)
-);
-DROP TABLE IF EXISTS fda.mdb_units;
-CREATE TABLE IF NOT EXISTS fda.mdb_units
-(
- uri VARCHAR(500) not null,
- name VARCHAR(255),
- created timestamp NOT NULL DEFAULT NOW(),
- created_by bigint,
- PRIMARY KEY (uri)
-);
--- Modified for H2
--- Assume id=1 is invalid
--- Assume id=2 is still valid token
--- CREATE VIEW IF NOT EXISTS fda.mdb_invalid_tokens AS
--- (SELECT `id`, `token_hash`, `creator`, `created`, `expires`, `last_used` FROM fda.`mdb_tokens` WHERE `id` = 1);
\ No newline at end of file
diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
index 8e5325a821..753f448c4d 100644
--- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
+++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
@@ -104,7 +104,7 @@ public class TableColumn implements Comparable<TableColumn> {
@CreatedDate
private Instant created;
- @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+ @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
@JoinTable(name = "mdb_columns_concepts",
joinColumns = {
@JoinColumn(name = "cid", referencedColumnName = "id", insertable = false, updatable = false),
@@ -114,7 +114,7 @@ public class TableColumn implements Comparable<TableColumn> {
inverseJoinColumns = @JoinColumn(name = "uri", referencedColumnName = "uri"))
private TableColumnConcept concept;
- @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+ @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
@JoinTable(name = "mdb_columns_units",
joinColumns = {
@JoinColumn(name = "cid", referencedColumnName = "id", insertable = false, updatable = false),
diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
index 2fff7bc4e7..a74c967e60 100644
--- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
+++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
@@ -1,10 +1,13 @@
package at.tuwien.entities.database.table.columns;
import lombok.*;
+import org.hibernate.annotations.JdbcTypeCode;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import jakarta.persistence.*;;
+import java.net.URI;
+import java.sql.Types;
import java.time.Instant;
import java.util.List;
diff --git a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
index 455280a5f9..fe1ad3725e 100644
--- a/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
+++ b/dbrepo-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
@@ -1,10 +1,13 @@
package at.tuwien.entities.database.table.columns;
import lombok.*;
+import org.hibernate.annotations.JdbcTypeCode;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import jakarta.persistence.*;;
+import java.net.URI;
+import java.sql.Types;
import java.time.Instant;
import java.util.List;
@@ -27,18 +30,6 @@ public class TableColumnUnit {
@Column(name = "name", nullable = false)
private String name;
- @org.springframework.data.annotation.Transient
- @ToString.Exclude
- @OneToMany(fetch = FetchType.LAZY)
- @JoinTable(name = "mdb_columns_units",
- joinColumns = @JoinColumn(name = "uri", referencedColumnName = "uri", insertable = false, updatable = false),
- inverseJoinColumns = {
- @JoinColumn(name = "cid", referencedColumnName = "id", insertable = false, updatable = false),
- @JoinColumn(name = "tid", referencedColumnName = "tid", insertable = false, updatable = false),
- @JoinColumn(name = "cdbid", referencedColumnName = "cdbid", insertable = false, updatable = false)
- })
- private List<TableColumn> columns;
-
@Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP")
@CreatedDate
private Instant created;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java
index 7a183b90e2..1fb428714f 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java
@@ -34,15 +34,6 @@ public class MetadataEndpointUnitTest extends BaseUnitTest {
@Autowired
private MetadataEndpoint metadataEndpoint;
- @Autowired
- private H2Utils h2Utils;
-
- @BeforeEach
- public void beforeEach() {
- /* schema */
- h2Utils.runScript("schema.sql");
- }
-
@Test
@WithAnonymousUser
public void identify_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
index 696f3494cc..26da5e82fa 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
@@ -46,13 +46,8 @@ public class IdentifierServiceIntegrationTest extends BaseUnitTest {
@Autowired
private IdentifierService identifierService;
- @Autowired
- private H2Utils h2Utils;
-
@BeforeEach
public void beforeEach() {
- /* schema */
- h2Utils.runScript("schema.sql");
/* metadata database */
imageRepository.save(IMAGE_1_SIMPLE);
realmRepository.save(REALM_DBREPO);
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java
index d75d363cdd..e8e68400ee 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java
@@ -45,13 +45,8 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest {
@Autowired
private MetadataService metadataService;
- @Autowired
- private H2Utils h2Utils;
-
@BeforeEach
public void beforeEach() {
- /* schema */
- h2Utils.runScript("schema.sql");
/* metadata database */
imageRepository.save(IMAGE_1_SIMPLE);
realmRepository.save(REALM_DBREPO);
diff --git a/dbrepo-metadata-service/rest-service/src/test/resources/schema.sql b/dbrepo-metadata-service/rest-service/src/test/resources/schema.sql
deleted file mode 100644
index 906d8df808..0000000000
--- a/dbrepo-metadata-service/rest-service/src/test/resources/schema.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE SCHEMA IF NOT EXISTS `fda`;
-SET SCHEMA `fda`;
-DROP TABLE IF EXISTS fda.mdb_concepts;
-CREATE TABLE IF NOT EXISTS fda.mdb_concepts
-(
- uri VARCHAR(500) not null,
- name VARCHAR(255),
- created timestamp NOT NULL DEFAULT NOW(),
- created_by bigint,
- PRIMARY KEY (uri)
-);
-DROP TABLE IF EXISTS fda.mdb_units;
-CREATE TABLE IF NOT EXISTS fda.mdb_units
-(
- uri VARCHAR(500) not null,
- name VARCHAR(255),
- created timestamp NOT NULL DEFAULT NOW(),
- created_by bigint,
- PRIMARY KEY (uri)
-);
--- Modified for H2
--- Assume id=1 is invalid
--- Assume id=2 is still valid token
--- CREATE VIEW IF NOT EXISTS fda.mdb_invalid_tokens AS
--- (SELECT `id`, `token_hash`, `creator`, `created`, `expires`, `last_used` FROM fda.`mdb_tokens` WHERE `id` = 1);
\ No newline at end of file
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/listener/RabbitMqListenerIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/listener/RabbitMqListenerIntegrationTest.java
index 09cd52fefd..cadc876d8b 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/listener/RabbitMqListenerIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/listener/RabbitMqListenerIntegrationTest.java
@@ -90,7 +90,6 @@ public class RabbitMqListenerIntegrationTest extends BaseUnitTest {
@BeforeEach
public void beforeEach() {
/* metadata database */
- h2Utils.runScript("schema.sql");
imageRepository.save(IMAGE_1_SIMPLE);
realmRepository.save(REALM_DBREPO);
userRepository.save(USER_1_SIMPLE);
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java
index c1cf0fbd16..7662f1dcbc 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java
@@ -71,7 +71,6 @@ public class ViewRepositoryIntegrationTest extends BaseUnitTest {
@BeforeEach
public void beforeEach() {
- h2Utils.runScript("schema.sql");
userRepository.save(USER_1);
imageRepository.save(IMAGE_1);
containerRepository.save(CONTAINER_1);
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
index 8422cf1dc6..4590f3e742 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
@@ -100,8 +100,6 @@ public class TableServiceIntegrationReadTest extends BaseUnitTest {
@BeforeEach
public void beforeEach() {
- /* metadata db */
- h2Utils.runScript("schema.sql");
/* metadata db */
imageRepository.save(IMAGE_1);
realmRepository.save(REALM_DBREPO);
diff --git a/dbrepo-query-service/rest-service/src/test/resources/application.properties b/dbrepo-query-service/rest-service/src/test/resources/application.properties
index ca9a7d11ef..4b947ac556 100644
--- a/dbrepo-query-service/rest-service/src/test/resources/application.properties
+++ b/dbrepo-query-service/rest-service/src/test/resources/application.properties
@@ -10,7 +10,7 @@ spring.cloud.config.enabled=false
# internal datasource
# spring 6 fix https://github.com/h2database/h2database/issues/3363
-spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE;DATABASE_TO_UPPER=false;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM './src/test/resources/schema.sql'
+spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE,KEY;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
diff --git a/dbrepo-query-service/rest-service/src/test/resources/schema.sql b/dbrepo-query-service/rest-service/src/test/resources/schema.sql
deleted file mode 100644
index 906d8df808..0000000000
--- a/dbrepo-query-service/rest-service/src/test/resources/schema.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE SCHEMA IF NOT EXISTS `fda`;
-SET SCHEMA `fda`;
-DROP TABLE IF EXISTS fda.mdb_concepts;
-CREATE TABLE IF NOT EXISTS fda.mdb_concepts
-(
- uri VARCHAR(500) not null,
- name VARCHAR(255),
- created timestamp NOT NULL DEFAULT NOW(),
- created_by bigint,
- PRIMARY KEY (uri)
-);
-DROP TABLE IF EXISTS fda.mdb_units;
-CREATE TABLE IF NOT EXISTS fda.mdb_units
-(
- uri VARCHAR(500) not null,
- name VARCHAR(255),
- created timestamp NOT NULL DEFAULT NOW(),
- created_by bigint,
- PRIMARY KEY (uri)
-);
--- Modified for H2
--- Assume id=1 is invalid
--- Assume id=2 is still valid token
--- CREATE VIEW IF NOT EXISTS fda.mdb_invalid_tokens AS
--- (SELECT `id`, `token_hash`, `creator`, `created`, `expires`, `last_used` FROM fda.`mdb_tokens` WHERE `id` = 1);
\ No newline at end of file
diff --git a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointIntegrationTest.java b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointIntegrationTest.java
index 5df092b16f..e52f7c89de 100644
--- a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointIntegrationTest.java
+++ b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointIntegrationTest.java
@@ -75,7 +75,6 @@ public class TableEndpointIntegrationTest extends BaseUnitTest {
/* create network */
DockerConfig.createAllNetworks();
/* metadata database */
- h2Utils.runScript("schema.sql");
imageRepository.save(IMAGE_1);
realmRepository.save(REALM_DBREPO);
userRepository.save(USER_1_SIMPLE);
diff --git a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
index 7f209d1d86..2759fe65b2 100644
--- a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
+++ b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
@@ -92,7 +92,6 @@ public class TableServiceIntegrationReadTest extends BaseUnitTest {
@BeforeEach
public void beforeEach() {
- h2Utils.runScript("schema.sql");
imageRepository.save(IMAGE_1);
realmRepository.save(REALM_DBREPO);
userRepository.save(USER_1_SIMPLE);
diff --git a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java
index 2bdbfed18a..d3482ae758 100644
--- a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java
+++ b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java
@@ -92,7 +92,6 @@ public class TableServiceIntegrationWriteTest extends BaseUnitTest {
DockerConfig.createContainer(BIND_WEATHER, CONTAINER_1, CONTAINER_1_ENV);
DockerConfig.startContainer(CONTAINER_1);
/* metadata database */
- h2Utils.runScript("schema.sql");
imageRepository.save(IMAGE_1);
realmRepository.save(REALM_DBREPO);
userRepository.save(USER_1_SIMPLE);
diff --git a/dbrepo-table-service/rest-service/src/test/resources/application.properties b/dbrepo-table-service/rest-service/src/test/resources/application.properties
index 81a1ff9203..65007f0765 100644
--- a/dbrepo-table-service/rest-service/src/test/resources/application.properties
+++ b/dbrepo-table-service/rest-service/src/test/resources/application.properties
@@ -10,7 +10,7 @@ spring.cloud.config.enabled=false
# internal datasource
# spring 6 fix https://github.com/h2database/h2database/issues/3363
-spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE;DATABASE_TO_UPPER=false;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM 'classpath:schema.sql'
+spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE,KEY;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
diff --git a/dbrepo-table-service/rest-service/src/test/resources/schema.sql b/dbrepo-table-service/rest-service/src/test/resources/schema.sql
deleted file mode 100644
index a668576dc0..0000000000
--- a/dbrepo-table-service/rest-service/src/test/resources/schema.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE SCHEMA IF NOT EXISTS `fda`;
-SET SCHEMA `fda`;
-DROP TABLE IF EXISTS fda.mdb_concepts;
-CREATE TABLE fda.mdb_concepts
-(
- uri VARCHAR(500) not null,
- name VARCHAR(255),
- created timestamp NOT NULL DEFAULT NOW(),
- created_by bigint,
- PRIMARY KEY (uri)
-);
-DROP TABLE IF EXISTS fda.mdb_units;
-CREATE TABLE fda.mdb_units
-(
- uri VARCHAR(500) not null,
- name VARCHAR(255),
- created timestamp NOT NULL DEFAULT NOW(),
- created_by bigint,
- PRIMARY KEY (uri)
-);
\ No newline at end of file
diff --git a/dbrepo-table-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java b/dbrepo-table-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
index f91a903333..73dd29d4ef 100644
--- a/dbrepo-table-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
+++ b/dbrepo-table-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
@@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
import io.swagger.v3.oas.annotations.security.SecurityScheme;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpMethod;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
diff --git a/dbrepo-user-service/rest-service/src/test/resources/application.properties b/dbrepo-user-service/rest-service/src/test/resources/application.properties
index 11e1ad7113..d2ef7c7093 100644
--- a/dbrepo-user-service/rest-service/src/test/resources/application.properties
+++ b/dbrepo-user-service/rest-service/src/test/resources/application.properties
@@ -10,7 +10,7 @@ spring.cloud.config.enabled=false
# internal datasource
# spring 6 fix https://github.com/h2database/h2database/issues/3363
-spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE;DATABASE_TO_UPPER=false;DB_CLOSE_ON_EXIT=FALSE;INIT=RUNSCRIPT FROM './src/test/resources/schema.sql'
+spring.datasource.url=jdbc:h2:mem:testdb;NON_KEYWORDS=VALUE,KEY;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
diff --git a/dbrepo-user-service/rest-service/src/test/resources/schema.sql b/dbrepo-user-service/rest-service/src/test/resources/schema.sql
deleted file mode 100644
index 906d8df808..0000000000
--- a/dbrepo-user-service/rest-service/src/test/resources/schema.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-CREATE SCHEMA IF NOT EXISTS `fda`;
-SET SCHEMA `fda`;
-DROP TABLE IF EXISTS fda.mdb_concepts;
-CREATE TABLE IF NOT EXISTS fda.mdb_concepts
-(
- uri VARCHAR(500) not null,
- name VARCHAR(255),
- created timestamp NOT NULL DEFAULT NOW(),
- created_by bigint,
- PRIMARY KEY (uri)
-);
-DROP TABLE IF EXISTS fda.mdb_units;
-CREATE TABLE IF NOT EXISTS fda.mdb_units
-(
- uri VARCHAR(500) not null,
- name VARCHAR(255),
- created timestamp NOT NULL DEFAULT NOW(),
- created_by bigint,
- PRIMARY KEY (uri)
-);
--- Modified for H2
--- Assume id=1 is invalid
--- Assume id=2 is still valid token
--- CREATE VIEW IF NOT EXISTS fda.mdb_invalid_tokens AS
--- (SELECT `id`, `token_hash`, `creator`, `created`, `expires`, `last_used` FROM fda.`mdb_tokens` WHERE `id` = 1);
\ No newline at end of file
diff --git a/dbrepo-user-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java b/dbrepo-user-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
index 93cc8c5631..3f1cf7c1ce 100644
--- a/dbrepo-user-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
+++ b/dbrepo-user-service/services/src/main/java/at/tuwien/config/WebSecurityConfig.java
@@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
import io.swagger.v3.oas.annotations.security.SecurityScheme;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpMethod;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
--
GitLab