diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
index 2f817c1ec836e3db275c721989c45dafd5cd70af..2b4f129bfb5141a31efc6e3e583dd9cd54eeb88e 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -22,12 +23,15 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@SpringBootTest
public class ActuatorComponentTest extends BaseUnitTest {
- @Autowired
- private MockMvc mockMvc;
-
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
+ @Autowired
+ private MockMvc mockMvc;
+
@Test
public void actuatorInfo_succeeds() throws Exception {
this.mockMvc.perform(get("/actuator/info"))
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointIntegrationTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointIntegrationTest.java
index 7c108704fb48d57c6a91b498a881feaa37a86932..406ca2e65b4d36ffdea6c9ede5e1b400ce60ae7e 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointIntegrationTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointIntegrationTest.java
@@ -8,6 +8,7 @@ import at.tuwien.config.ReadyConfig;
import at.tuwien.endpoints.IdentifierEndpoint;
import at.tuwien.exception.NotAllowedException;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -39,6 +40,9 @@ public class IdentifierEndpointIntegrationTest extends BaseUnitTest {
@MockBean
private ReadyConfig readyConfig;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
@Autowired
private IdentifierRepository identifierRepository;
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointUnitTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointUnitTest.java
index b7725ef7ff32c1d24baaecaeed59dde004e3998c..c98c045e69b9d2e6be6f8a7c855659b7674b039f 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointUnitTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/IdentifierEndpointUnitTest.java
@@ -17,6 +17,7 @@ import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.gateway.QueryServiceGateway;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import at.tuwien.service.AccessService;
import at.tuwien.service.IdentifierService;
import org.apache.commons.io.FileUtils;
@@ -53,7 +54,7 @@ public class IdentifierEndpointUnitTest extends BaseUnitTest {
private ReadyConfig readyConfig;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
@MockBean
private IdentifierService identifierService;
@@ -79,6 +80,9 @@ public class IdentifierEndpointUnitTest extends BaseUnitTest {
@MockBean
private QueryServiceGateway queryServiceGateway;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
@Autowired
private IdentifierEndpoint identifierEndpoint;
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/PersistenceEndpointUnitTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/PersistenceEndpointUnitTest.java
index 7e9c11f73dd68621069b8a396a1d9627d7762e52..2f74995d16a86cc042eb909ae75360338adfb287 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/PersistenceEndpointUnitTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/PersistenceEndpointUnitTest.java
@@ -11,6 +11,7 @@ import at.tuwien.endpoints.PersistenceEndpoint;
import at.tuwien.entities.identifier.Identifier;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import at.tuwien.service.AccessService;
import at.tuwien.service.IdentifierService;
import at.tuwien.service.UserService;
@@ -54,7 +55,10 @@ public class PersistenceEndpointUnitTest extends BaseUnitTest {
private ReadyConfig readyConfig;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
@MockBean
private AccessService accessService;
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
index 47a13598411493feb0bee24548014427ecb856f9..6ef1503d94a374da4238fc8f909502c3c83c32c8 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -28,6 +29,9 @@ public class SwaggerComponentTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
@Test
public void swaggerUi_succeeds() throws Exception {
this.mockMvc.perform(get("/swagger-ui/index.html"))
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/gateway/QueryServiceGatewayUnitTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/gateway/QueryServiceGatewayUnitTest.java
index a647d6e54ec3b4419bf4599555f8e3483fbd0f1a..055cc56e07a32c23bd95a6928c56da046d646dbe 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/gateway/QueryServiceGatewayUnitTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/gateway/QueryServiceGatewayUnitTest.java
@@ -7,6 +7,7 @@ import at.tuwien.config.ReadyConfig;
import at.tuwien.exception.QueryNotFoundException;
import at.tuwien.exception.RemoteUnavailableException;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import com.google.common.io.Files;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -36,11 +37,14 @@ import static org.mockito.Mockito.*;
public class QueryServiceGatewayUnitTest extends BaseUnitTest {
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
@MockBean
private ReadyConfig readyConfig;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
@MockBean
@Qualifier("restTemplate")
private RestTemplate restTemplate;
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java
index 152ee248ab508cd9ff86ce8818d80111f5e62f77..beea45933df3de4a2bab46639e7cfa5135e95df4 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServiceUnitTest.java
@@ -12,6 +12,7 @@ import at.tuwien.config.IndexConfig;
import at.tuwien.entities.identifier.Identifier;
import at.tuwien.exception.*;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import at.tuwien.service.impl.IdentifierServiceImpl;
import org.apache.http.auth.BasicUserPrincipal;
import org.junit.jupiter.api.BeforeEach;
@@ -46,7 +47,7 @@ import static org.mockito.Mockito.when;
public class DataCiteIdentifierServiceUnitTest extends BaseUnitTest {
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
@MockBean(answer = Answers.RETURNS_MOCKS)
private DataCiteConfig dataCiteConfig;
@@ -54,6 +55,9 @@ public class DataCiteIdentifierServiceUnitTest extends BaseUnitTest {
@MockBean(answer = Answers.RETURNS_MOCKS)
private EndpointConfig endpointConfig;
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
+
@Autowired
private ImageRepository imageRepository;
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
index 8c51b6b76fc9ac7587e22c3701624468a2cd82aa..aeaaa30d623396d2129f313bb9d00255bb2ede02 100644
--- a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
@@ -5,6 +5,7 @@ import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +24,10 @@ import static org.mockito.Mockito.when;
public class UserServiceUnitTest extends BaseUnitTest {
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private IdentifierIdxRepository identifierIdxRepository;
@MockBean
private UserRepository userRepository;
diff --git a/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
index c9874c5799e168d853f930b0fafce9a497805f51..519e37ec5408b21eb8cd27fa406017eb03d12748 100644
--- a/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -900,8 +900,8 @@ public abstract class BaseTest {
.build();
public final static Long IMAGE_ELASTIC_ID = 3L;
- public final static String IMAGE_ELASTIC_REPOSITORY = "elasticsearch";
- public final static String IMAGE_ELASTIC_TAG = "8.7.1";
+ public final static String IMAGE_ELASTIC_REPOSITORY = "opensearchproject/opensearch";
+ public final static String IMAGE_ELASTIC_TAG = "2";
public final static ContainerImage IMAGE_ELASTIC = ContainerImage.builder()
.id(IMAGE_ELASTIC_ID)
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
index cab709d9c6692a9e2c0cc236520751659ec4306d..3ff9a8426725a8351080c9e32bc8392477eae7d2 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -32,6 +33,9 @@ public class ActuatorComponentTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@Test
public void actuatorInfo_succeeds() throws Exception {
this.mockMvc.perform(get("/actuator/info"))
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ExportEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ExportEndpointUnitTest.java
index 79fb6ebffa0d1a6e6cf334c31f09a4498c49c2bc..2fc48f70c83a3dffd308be4bdf7ab411fb8a730f 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ExportEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ExportEndpointUnitTest.java
@@ -11,6 +11,7 @@ import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.DatabaseAccessRepository;
import at.tuwien.repository.mdb.TableRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.QueryService;
import com.rabbitmq.client.Channel;
@@ -50,7 +51,10 @@ public class ExportEndpointUnitTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java
index 5d9f72c2e6221904369ff5b5177834b3b6dcef0f..e9b3371a748ec4884b0662263805e55b096004d4 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/QueryEndpointUnitTest.java
@@ -17,6 +17,7 @@ import at.tuwien.repository.mdb.ContainerRepository;
import at.tuwien.repository.mdb.DatabaseAccessRepository;
import at.tuwien.repository.mdb.DatabaseRepository;
import at.tuwien.repository.mdb.ImageRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.QueryService;
import at.tuwien.service.StoreService;
import com.rabbitmq.client.Channel;
@@ -55,13 +56,14 @@ public class QueryEndpointUnitTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/StoreEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/StoreEndpointUnitTest.java
index e488a3983a74aad9aaac04202ff687a552f4a80e..e4d98d80443fd800b39b7f924461f1597558527d 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/StoreEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/StoreEndpointUnitTest.java
@@ -13,6 +13,7 @@ import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.querystore.Query;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.AccessService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.impl.StoreServiceImpl;
@@ -48,7 +49,10 @@ public class StoreEndpointUnitTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
index 2f448ca36e90e3d81aac0e68ddaa7304fbeb5af9..0516fc4682104ce018f8d6e196884c79ae69cb51 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -32,6 +33,9 @@ public class SwaggerComponentTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@Test
public void swaggerUi_succeeds() throws Exception {
this.mockMvc.perform(get("/swagger-ui/index.html"))
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableDataEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableDataEndpointUnitTest.java
index 263118e014726c3df8ed4a2c5262617bf555d8d0..0374aae586a6649c8e4570c503bd828fd41a8451 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableDataEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableDataEndpointUnitTest.java
@@ -14,6 +14,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.MessageQueueListener;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.AccessService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.TableService;
@@ -53,11 +54,12 @@ public class TableDataEndpointUnitTest extends BaseUnitTest {
@MockBean
private Channel channel;
- /* keep */
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableHistoryEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableHistoryEndpointUnitTest.java
index 37d544535616895b9a6fb0b8a2eca97369869470..3a32885368f8e94f893786f6743aa227ff5095a6 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableHistoryEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/TableHistoryEndpointUnitTest.java
@@ -11,6 +11,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.DatabaseAccessRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.QueryService;
import at.tuwien.service.TableService;
@@ -48,11 +49,12 @@ public class TableHistoryEndpointUnitTest extends BaseUnitTest {
@MockBean
private Channel channel;
- /* keep */
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
index 0d26d44b03017e07172174d1310de7547787ee6a..9644e2113a9ab7c55bfeeaa5fad59f9f1dea3d6a 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
@@ -14,6 +14,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.MessageQueueListener;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import at.tuwien.service.AccessService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.QueryService;
@@ -51,13 +52,14 @@ public class ViewEndpointUnitTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
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 20ac8e417664704e68b62d65234df8b787dfd5e4..5acda1d8b2af83ba809bb9e050b7178514b44ac0 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
@@ -4,6 +4,7 @@ import at.tuwien.BaseUnitTest;
import at.tuwien.api.amqp.ConsumerDto;
import at.tuwien.config.*;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.BuiltinExchangeType;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
@@ -38,6 +39,9 @@ public class RabbitMqListenerIntegrationTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@Autowired
private Channel channel;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java
index f68804e6e06ff63e1fc574ce8a8590b08cb498d3..038b63c95a340e1f1266c40f7d7c9b44eb432322 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java
@@ -7,6 +7,7 @@ import at.tuwien.entities.container.image.ContainerImageDate;
import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.entities.database.table.columns.TableColumnType;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -33,7 +34,10 @@ public class QueryMapperTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
index e686fdb7053d896496b639e8b9369407bbe5db9d..1dd83a35bb7bbc2f9d4f27e1b8b641df2d44ac1d 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
@@ -48,11 +48,9 @@ public class ViewIdxRepositoryIntegrationTest extends BaseUnitTest {
@MockBean
private Channel channel;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
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 3e3e84f705139ed2f8c8d6de3879622e8c95e676..e064717095f46f3ccac6a190e63c92f9154548d5 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
@@ -7,6 +7,7 @@ import at.tuwien.entities.database.View;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.Rule;
@@ -45,6 +46,9 @@ public class ViewRepositoryIntegrationTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@Autowired
private ImageRepository imageRepository;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
index 016f4aa756f853de70b351c0389db4ca16872f67..c4c6016e50a30f4302a99e23b940129bfc73b6a4 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
@@ -8,6 +8,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
@@ -39,11 +40,12 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
@MockBean
private Channel channel;
- /* keep */
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
index cb6424ba3500819fb8ba573dde3b8c1638de5e12..7e8d87f8069fa7f1ce941fc5b2ba03c0671fa75a 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
@@ -13,6 +13,7 @@ import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.querystore.Query;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import at.tuwien.config.DockerConfig;
import lombok.SneakyThrows;
@@ -63,6 +64,9 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
index c5a1c96c0cf9d78ea671fc420c38d37bc3351796..7bc34bce9e0b2a967ae24f5cf082aabfd256e2c1 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
@@ -10,6 +10,7 @@ import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.DatabaseRepository;
import at.tuwien.repository.mdb.TableRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.rabbitmq.client.*;
import lombok.extern.log4j.Log4j2;
@@ -49,7 +50,10 @@ public class QueueServiceIntegrationTest extends BaseUnitTest {
private TableRepository tableRepository;
@MockBean
- private IndexConfig indexInitializer;
+ private ViewIdxRepository viewIdxRepository;
+
+ @MockBean
+ private IndexConfig indexConfig;
@MockBean
private RabbitMqConsumer rabbitMqConsumer;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java
index cf298251339bc18b8d98d2aaed835bcef3dcf0f4..559633c43bdeab1f176261266dfc80048779a623 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java
@@ -11,6 +11,7 @@ import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.querystore.Query;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import at.tuwien.config.DockerConfig;
import lombok.extern.log4j.Log4j2;
@@ -51,14 +52,15 @@ public class StoreServiceIntegrationModifyTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private Channel channel;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationReadTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationReadTest.java
index 21d1c91d17f22b0753d7034bda2efb8a8cccef56..f41d511770598114e12016f50a645396106f7680 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationReadTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationReadTest.java
@@ -10,6 +10,7 @@ import at.tuwien.querystore.Query;
import at.tuwien.repository.mdb.DatabaseRepository;
import at.tuwien.repository.mdb.TableRepository;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import at.tuwien.config.DockerConfig;
import lombok.extern.log4j.Log4j2;
@@ -48,6 +49,9 @@ public class StoreServiceIntegrationReadTest extends BaseUnitTest {
@MockBean
private Channel channel;
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
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 118f368e02ae42fd8fb3a2041edfe946354c7bca..f7b8b21bffaf654347245c223cec91437f1fe6f6 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
@@ -9,6 +9,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import at.tuwien.config.DockerConfig;
import lombok.extern.log4j.Log4j2;
@@ -48,11 +49,12 @@ public class TableServiceIntegrationReadTest extends BaseUnitTest {
@MockBean
private Channel channel;
- /* keep */
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
+
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
index 5a8bc48cea1b5be7cd29f6dd62c3579f34a59b4b..5c91cb6b6bc8258a88a414f419c1e9262f169345 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
@@ -8,6 +8,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.ViewIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.*;
@@ -41,7 +42,10 @@ public class TableServiceUnitTest extends BaseUnitTest {
private Channel channel;
@MockBean
- private IndexConfig indexInitializer;
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private ViewIdxRepository viewIdxRepository;
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
diff --git a/dbrepo-semantics-service/services/src/main/java/at/tuwien/repository/mdb/TableColumnRepository.java b/dbrepo-semantics-service/services/src/main/java/at/tuwien/repository/mdb/TableColumnRepository.java
index de41d04da23a85fbaec1c8571b9394f14427ece2..b52cc85d3552636e4463a848f651c45e6292a2cc 100644
--- a/dbrepo-semantics-service/services/src/main/java/at/tuwien/repository/mdb/TableColumnRepository.java
+++ b/dbrepo-semantics-service/services/src/main/java/at/tuwien/repository/mdb/TableColumnRepository.java
@@ -6,6 +6,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
-public interface TableColumnRepository extends JpaRepository<TableColumn, Long> {
+public interface TableColumnRepository extends JpaRepository<TableColumn, TableColumnKey> {
}
diff --git a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
index cab709d9c6692a9e2c0cc236520751659ec4306d..1bb964bbbd36238e453369de069f2410707c5d25 100644
--- a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
+++ b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -2,6 +2,8 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.TableColumnIdxRepository;
+import at.tuwien.repository.sdb.TableIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -32,6 +34,12 @@ public class ActuatorComponentTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private TableIdxRepository tableIdxRepository;
+
+ @MockBean
+ private TableColumnIdxRepository tableColumnIdxRepository;
+
@Test
public void actuatorInfo_succeeds() throws Exception {
this.mockMvc.perform(get("/actuator/info"))
diff --git a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
index 2f448ca36e90e3d81aac0e68ddaa7304fbeb5af9..ee93d9c9a2f25e91857bbc57d95ecbeea9557d4f 100644
--- a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
+++ b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -2,6 +2,8 @@ package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.TableColumnIdxRepository;
+import at.tuwien.repository.sdb.TableIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -32,6 +34,12 @@ public class SwaggerComponentTest extends BaseUnitTest {
@MockBean
private IndexConfig indexConfig;
+ @MockBean
+ private TableIdxRepository tableIdxRepository;
+
+ @MockBean
+ private TableColumnIdxRepository tableColumnIdxRepository;
+
@Test
public void swaggerUi_succeeds() throws Exception {
this.mockMvc.perform(get("/swagger-ui/index.html"))
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
index 041e444616f232b957b5d0f756382b760f7df36a..d63621139c5d7974660eaeaece1f34735ba0726e 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -1,6 +1,8 @@
package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.UserIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -22,6 +24,12 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@SpringBootTest
public class ActuatorComponentTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private MockMvc mockMvc;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/MaintenanceEndpointUnitTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/MaintenanceEndpointUnitTest.java
index 36097258c132aa0525a1d5c180ca150fc9709d68..329c1c57b399e298dad7ad3d1f89c4f009388b90 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/MaintenanceEndpointUnitTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/MaintenanceEndpointUnitTest.java
@@ -5,9 +5,11 @@ import at.tuwien.api.maintenance.BannerMessageBriefDto;
import at.tuwien.api.maintenance.BannerMessageCreateDto;
import at.tuwien.api.maintenance.BannerMessageDto;
import at.tuwien.api.maintenance.BannerMessageUpdateDto;
+import at.tuwien.config.IndexConfig;
import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.maintenance.BannerMessage;
import at.tuwien.exception.*;
+import at.tuwien.repository.sdb.UserIdxRepository;
import at.tuwien.service.BannerMessageService;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -35,6 +37,12 @@ import static org.mockito.Mockito.*;
@ExtendWith(SpringExtension.class)
public class MaintenanceEndpointUnitTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@MockBean
private ReadyConfig readyConfig;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
index 431a54052c11bc0eb4422c195e7242b829de65ce..c47f9dfbc7a25d37056ece68eab2cd163d55eacf 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -1,6 +1,8 @@
package at.tuwien.endpoint;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.UserIdxRepository;
import com.rabbitmq.client.Channel;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -22,6 +24,12 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@SpringBootTest
public class SwaggerComponentTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private MockMvc mockMvc;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/UserEndpointUnitTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/UserEndpointUnitTest.java
index cec34bf0a50ad3b66641cbefc877a1fcd58d8854..088b60ed4797d40cfc4def24395fb779509398cc 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/UserEndpointUnitTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/UserEndpointUnitTest.java
@@ -4,10 +4,12 @@ import at.tuwien.BaseUnitTest;
import at.tuwien.api.auth.SignupRequestDto;
import at.tuwien.api.user.*;
import at.tuwien.config.AuthenticationConfig;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.Realm;
import at.tuwien.entities.user.Role;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
+import at.tuwien.repository.sdb.UserIdxRepository;
import at.tuwien.service.RealmService;
import at.tuwien.service.RoleService;
import at.tuwien.service.UserService;
@@ -40,6 +42,12 @@ import static org.mockito.Mockito.*;
@ExtendWith(SpringExtension.class)
public class UserEndpointUnitTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@MockBean
private UserService userService;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/mapper/UserMapperTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/mapper/UserMapperTest.java
index eefde32629df5e8dfc5cad2ce9d3f2818dca815a..1a8e6ee845d4f5f29caa56589a4401fccd213a22 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/mapper/UserMapperTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/mapper/UserMapperTest.java
@@ -1,10 +1,13 @@
package at.tuwien.mapper;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.User;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -13,6 +16,12 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
@SpringBootTest
public class UserMapperTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Test
public void equals_fails() {
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java
index 5d181b3f753be68d1196206f488eccf522af04b1..673b48458875961c2a2f5577f32a0bd44a9849ec 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/BannerMessageServiceIntegrationTest.java
@@ -4,10 +4,12 @@ import at.tuwien.BaseUnitTest;
import at.tuwien.api.maintenance.BannerMessageCreateDto;
import at.tuwien.api.maintenance.BannerMessageTypeDto;
import at.tuwien.api.maintenance.BannerMessageUpdateDto;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.maintenance.BannerMessage;
import at.tuwien.entities.maintenance.BannerMessageType;
import at.tuwien.exception.BannerMessageNotFoundException;
import at.tuwien.repository.mdb.BannerMessageRepository;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -16,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -30,6 +33,12 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(SpringExtension.class)
public class BannerMessageServiceIntegrationTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private BannerMessageRepository bannerMessageRepository;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RealmServiceIntegrationTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RealmServiceIntegrationTest.java
index 584a508ebb571ec227b45b5321315267c0b58a1a..5107c8fda008b1c5434e3fbf551595d37719f3af 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RealmServiceIntegrationTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RealmServiceIntegrationTest.java
@@ -1,9 +1,11 @@
package at.tuwien.service;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.Realm;
import at.tuwien.exception.RealmNotFoundException;
import at.tuwien.repository.mdb.RealmRepository;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -24,6 +27,12 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(SpringExtension.class)
public class RealmServiceIntegrationTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private RealmRepository realmRepository;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RoleServiceIntegrationTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RoleServiceIntegrationTest.java
index ef6382bc37f131adcbf2d7c09f6a3dc58b1f3964..6d957b51a8381228887976bd96cd176a78a52ca3 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RoleServiceIntegrationTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/RoleServiceIntegrationTest.java
@@ -1,10 +1,12 @@
package at.tuwien.service;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.Role;
import at.tuwien.exception.RoleNotFoundException;
import at.tuwien.repository.mdb.RoleRepository;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -25,6 +28,12 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(SpringExtension.class)
public class RoleServiceIntegrationTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private UserRepository userRepository;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserAttributeServiceIntegrationTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserAttributeServiceIntegrationTest.java
index 131e7891e3eb5de788c491b12a2307f6aed8cabe..95ce65f079107cb523eeb4a567284a95511db9b1 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserAttributeServiceIntegrationTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserAttributeServiceIntegrationTest.java
@@ -1,10 +1,12 @@
package at.tuwien.service;
import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.UserAttribute;
import at.tuwien.exception.UserAttributeNotFoundException;
import at.tuwien.repository.mdb.UserAttributeRepository;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -27,6 +30,12 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(SpringExtension.class)
public class UserAttributeServiceIntegrationTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private UserRepository userRepository;
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
index bef7f2b3b4898cfced8a434866d145e05de7bfea..1f13cf099824f2bdd681ded485618ee03673f03d 100644
--- a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
@@ -5,6 +5,7 @@ import at.tuwien.api.auth.SignupRequestDto;
import at.tuwien.api.user.UserPasswordDto;
import at.tuwien.api.user.UserThemeSetDto;
import at.tuwien.api.user.UserUpdateDto;
+import at.tuwien.config.IndexConfig;
import at.tuwien.entities.user.Role;
import at.tuwien.entities.user.User;
import at.tuwien.entities.user.UserAttribute;
@@ -12,6 +13,7 @@ import at.tuwien.exception.*;
import at.tuwien.repository.mdb.RealmRepository;
import at.tuwien.repository.mdb.RoleRepository;
import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.UserIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -20,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -37,6 +40,12 @@ import static org.junit.jupiter.api.Assertions.*;
@ExtendWith(SpringExtension.class)
public class UserServiceIntegrationTest extends BaseUnitTest {
+ @MockBean
+ private IndexConfig indexConfig;
+
+ @MockBean
+ private UserIdxRepository userIdxRepository;
+
@Autowired
private UserRepository userRepository;