From a44282fc95ac47772a55d30a9f8c3ad943fde88e Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 16 Nov 2022 15:42:46 +0100
Subject: [PATCH] Fixed database service
---
.../at/tuwien/service/AmqpServiceIntegrationTest.java | 10 ++++++----
.../tuwien/service/DatabaseServiceIntegrationTest.java | 4 ++++
.../at/tuwien/service/DatabaseServiceUnitTest.java | 5 ++++-
.../src/test/resources/application.properties | 3 ---
.../main/java/at/tuwien/config/IndexInitializer.java | 9 +--------
5 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/fda-database-service/rest-service/src/test/java/at/tuwien/service/AmqpServiceIntegrationTest.java b/fda-database-service/rest-service/src/test/java/at/tuwien/service/AmqpServiceIntegrationTest.java
index f67533167f..4997244bf2 100644
--- a/fda-database-service/rest-service/src/test/java/at/tuwien/service/AmqpServiceIntegrationTest.java
+++ b/fda-database-service/rest-service/src/test/java/at/tuwien/service/AmqpServiceIntegrationTest.java
@@ -1,6 +1,7 @@
package at.tuwien.service;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexInitializer;
import at.tuwien.config.ReadyConfig;
import at.tuwien.exception.AmqpException;
import at.tuwien.exception.BrokerVirtualHostCreationException;
@@ -22,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Profile;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -35,14 +37,14 @@ import static at.tuwien.config.DockerConfig.hostConfig;
@Log4j2
@SpringBootTest
@ExtendWith(SpringExtension.class)
-@ActiveProfiles("test-noelastic")
public class AmqpServiceIntegrationTest extends BaseUnitTest {
- private static final String AMQP_EXCHANGE = "fda";
-
@MockBean
private ReadyConfig readyConfig;
+ @MockBean
+ private IndexInitializer indexInitializer;
+
@Autowired
private Channel channel;
@@ -118,7 +120,7 @@ public class AmqpServiceIntegrationTest extends BaseUnitTest {
}
@Test
- public void createExchange_succeeds() throws AmqpException, IOException, BrokerVirtualHostCreationException {
+ public void createExchange_succeeds() throws AmqpException, IOException {
final Principal principal = new BasicUserPrincipal(USER_1_USERNAME);
/* mock */
diff --git a/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
index fb0c55c42b..e52d86c4db 100644
--- a/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
+++ b/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
@@ -3,6 +3,7 @@ package at.tuwien.service;
import at.tuwien.BaseUnitTest;
import at.tuwien.api.database.DatabaseCreateDto;
import at.tuwien.config.DockerConfig;
+import at.tuwien.config.IndexInitializer;
import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.container.Container;
import at.tuwien.entities.database.Database;
@@ -45,6 +46,9 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
@MockBean
private ReadyConfig readyConfig;
+ @MockBean
+ private IndexInitializer indexInitializer;
+
@MockBean
private Channel channel;
diff --git a/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java b/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
index eba11700e1..32f3229c22 100644
--- a/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
+++ b/fda-database-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
@@ -2,6 +2,7 @@ package at.tuwien.service;
import at.tuwien.BaseUnitTest;
import at.tuwien.api.database.DatabaseCreateDto;
+import at.tuwien.config.IndexInitializer;
import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.container.Container;
import at.tuwien.entities.database.Database;
@@ -39,12 +40,14 @@ import static org.mockito.Mockito.*;
@Log4j2
@SpringBootTest
@ExtendWith(SpringExtension.class)
-@ActiveProfiles("test-noelastic")
public class DatabaseServiceUnitTest extends BaseUnitTest {
@MockBean
private ReadyConfig readyConfig;
+ @MockBean
+ private IndexInitializer indexInitializer;
+
@MockBean
private Channel channel;
diff --git a/fda-database-service/rest-service/src/test/resources/application.properties b/fda-database-service/rest-service/src/test/resources/application.properties
index 727187fbfe..2040f94bc4 100644
--- a/fda-database-service/rest-service/src/test/resources/application.properties
+++ b/fda-database-service/rest-service/src/test/resources/application.properties
@@ -17,7 +17,4 @@ spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
spring.jpa.hibernate.ddl-auto=create-drop
spring.jpa.show-sql=false
-# disable elasticsearch
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration,org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration,org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration
-
spring.rabbitmq.host=broker-service
\ No newline at end of file
diff --git a/fda-database-service/services/src/main/java/at/tuwien/config/IndexInitializer.java b/fda-database-service/services/src/main/java/at/tuwien/config/IndexInitializer.java
index 5c6544af42..de9c6663d0 100644
--- a/fda-database-service/services/src/main/java/at/tuwien/config/IndexInitializer.java
+++ b/fda-database-service/services/src/main/java/at/tuwien/config/IndexInitializer.java
@@ -4,8 +4,6 @@ import at.tuwien.entities.database.Database;
import lombok.extern.log4j.Log4j2;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.event.EventListener;
-import org.springframework.core.env.Environment;
-import org.springframework.core.env.Profiles;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
import org.springframework.stereotype.Component;
@@ -14,19 +12,14 @@ import org.springframework.stereotype.Component;
@Log4j2
public class IndexInitializer {
- private final Environment environment;
private final ElasticsearchOperations elasticsearchOperations;
- public IndexInitializer(Environment environment, ElasticsearchOperations elasticsearchOperations) {
- this.environment = environment;
+ public IndexInitializer(ElasticsearchOperations elasticsearchOperations) {
this.elasticsearchOperations = elasticsearchOperations;
}
@EventListener(ApplicationReadyEvent.class)
public void initIndex() {
- if (environment.acceptsProfiles(Profiles.of("test-noelastic"))) {
- return;
- }
log.debug("creating index");
IndexCoordinates indexCoordinates = IndexCoordinates.of("databaseindex");
if (!elasticsearchOperations.indexOps(indexCoordinates).exists()) {
--
GitLab