Remove Testcontainers And Add Different Cursor Behaviour

basyx.aasregistry/basyx.aasregistry-plugins/src/main/lombok/org/eclipse/digitaltwin/basyx/aasregistry/plugins/path/PathInfo.java

@@ -37,7 +37,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
-import lombok.experimental.UtilityClass;
 
 @Data
 public class PathInfo {
@@ -187,10 +186,12 @@ public ModelInfo(String name) {
 
 	}
 
-	@UtilityClass
-	private static class ConstantGenerator {
+	private static final class ConstantGenerator {
 
-		public String generateConstant(String name) {
+		private ConstantGenerator() {			
+		}
+
+		public static String generateConstant(String name) {
 			StringBuilder builder = new StringBuilder();
 			for (int i = 0, len = name.length(); i < len; i++) {
 				char c = name.charAt(i);

basyx.aasregistry/basyx.aasregistry-service-basetests/README.md

@@ -6,9 +6,7 @@ We use an extra project here instead of *test-jar* maven artifact generation, as
 
 Have a look at the mongoDb-storage project or the release projects to see how the abstract test classes defined here can be used. The classes provide good test coverage. You can extend them without writing additional test cases for your storage.
 
-Use [testcontainers](https://www.testcontainers.org/) for your integration or storage tests. 
-
-The integration test of the [kafka-mongodb release](../basyx.aasregistry-service-release-kafka-mongodb/Readme.md) project starts an Apache Kafka and an MongoDb instance using testcontainers. Don't forget to start a docker daemon before running the tests.
+ Don't forget to start a docker daemon before running the tests and to run the docker-compose file of the parent folder.
 
 
 

basyx.aasregistry/basyx.aasregistry-service-basetests/pom.xml

@@ -58,11 +58,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
-			<version>${testcontainers.version}</version>
-		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>

basyx.aasregistry/basyx.aasregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/CloningAasRegistryStorageDecorator.java

@@ -29,22 +29,21 @@
 import org.eclipse.digitaltwin.basyx.aasregistry.model.AssetAdministrationShellDescriptor;
 import org.eclipse.digitaltwin.basyx.aasregistry.model.SubmodelDescriptor;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.AasRegistryStorage;
+import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.AasRegistryStorageDelegate;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.DescriptorCopies;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.DescriptorFilter;
 import org.eclipse.digitaltwin.basyx.core.pagination.CursorResult;
 import org.eclipse.digitaltwin.basyx.core.pagination.PaginationInfo;
 
 import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.Delegate;
 
 //performs additional cloning for in memory tests so that
 //altering the objects during tests will then not affect the storage
-@RequiredArgsConstructor
-public class CloningAasRegistryStorageDecorator implements AasRegistryStorage {
+public class CloningAasRegistryStorageDecorator extends AasRegistryStorageDelegate {
 
-	@Delegate
-	private final AasRegistryStorage storage;
+	public CloningAasRegistryStorageDecorator(AasRegistryStorage storage) {
+		super(storage);
+	}
 
 	@Override
 	public CursorResult<List<AssetAdministrationShellDescriptor>> getAllAasDescriptors(@NonNull PaginationInfo pRequest, @NonNull DescriptorFilter filter) {

basyx.aasregistry/basyx.aasregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/ExtensionsTest.java

@@ -45,9 +45,9 @@
 import org.junit.Test;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
-import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 
 public abstract class ExtensionsTest extends BaseInterfaceTest {

basyx.aasregistry/basyx.aasregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/integration/BaseIntegrationTest.java

@@ -89,7 +89,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -137,21 +136,18 @@ public abstract class BaseIntegrationTest {
 	@Rule
 	public TestResourcesLoader resourceLoader = new TestResourcesLoader(BaseIntegrationTest.class.getPackageName(), mapper);
 
-	@Autowired
-	private BaseEventListener listener;
-
 	protected RegistryAndDiscoveryInterfaceApi api;
 
 	@Before
 	public void initClient() throws ApiException {
 		api = new RegistryAndDiscoveryInterfaceApi("http", "127.0.0.1", port);
 		api.deleteAllShellDescriptors();
-		listener.assertNoAdditionalMessage();
+		queue().assertNoAdditionalMessage();
 	}
 
 	@After
 	public void cleanup() throws ApiException {
-		listener.assertNoAdditionalMessage();
+		queue().assertNoAdditionalMessage();
 		GetAssetAdministrationShellDescriptorsResult result = api.getAllAssetAdministrationShellDescriptors(null, null, null, null);
 		for (AssetAdministrationShellDescriptor eachDescriptor : result.getResult()) {
 			api.deleteAssetAdministrationShellDescriptorById(eachDescriptor.getId());
@@ -178,7 +174,7 @@ public void whenWritingParallel_transactionManagementWorks() throws ApiException
 		assertThat(IntStream.iterate(0, i -> i + 1).limit(300).parallel().mapToObj(op).filter(i -> i > 300).findAny()).isEmpty();
 		assertThat(api.getAssetAdministrationShellDescriptorById(descriptor.getId()).getSubmodelDescriptors()).hasSize(300);
 		for (int i = 0; i < 300; i++) {
-			RegistryEvent evt = listener.poll();
+			RegistryEvent evt = queue().poll();
 			assertThat(evt.getId()).isEqualTo(descriptor.getId());
 			assertThat(Integer.parseInt(evt.getSubmodelId())).isGreaterThanOrEqualTo(0).isLessThan(300);
 
@@ -207,6 +203,7 @@ private Integer writeSubModel(String descriptorId, int idx) {
 
 	@Test
 	public void whenDeleteAll_thenAllDescriptorsAreRemoved() throws ApiException {
+
 		for (int i = 0; i < DELETE_ALL_TEST_INSTANCE_COUNT; i++) {
 			AssetAdministrationShellDescriptor descr = new AssetAdministrationShellDescriptor();
 			String id = "id_" + i;
@@ -227,13 +224,13 @@ public void whenDeleteAll_thenAllDescriptorsAreRemoved() throws ApiException {
 		HashSet<RegistryEvent> events = new HashSet<>();
 		// we do not have a specific order, so read all events first
 		for (int i = 0; i < DELETE_ALL_TEST_INSTANCE_COUNT; i++) {
-			events.add(listener.poll());
+			events.add(queue().poll());
 		}
 		for (int i = 0; i < DELETE_ALL_TEST_INSTANCE_COUNT; i++) {
 			assertThat(events.remove(RegistryEvent.builder().id("id_" + i).type(EventType.AAS_UNREGISTERED).build())).isTrue();
 		}
 		assertThat(events.isEmpty());
-		listener.assertNoAdditionalMessage();
+		queue().assertNoAdditionalMessage();
 	}
 
 	@Test
@@ -249,7 +246,7 @@ public void whenCreateAndDeleteDescriptors_thenAllDescriptorsAreRemoved() throws
 		all = api.getAllAssetAdministrationShellDescriptors(port, null, null, null).getResult();
 		assertThat(all).isEmpty();
 
-		listener.assertNoAdditionalMessage();
+		queue().assertNoAdditionalMessage();
 	}
 
 	@Test
@@ -282,7 +279,7 @@ public void whenRegisterAndUnregisterSubmodel_thenSubmodelIsCreatedAndDeleted()
 		aasDescriptor = api.getAssetAdministrationShellDescriptorById(aasId);
 		assertThat(aasDescriptor.getSubmodelDescriptors()).doesNotContain(toRegister);
 
-		listener.assertNoAdditionalMessage();
+		queue().assertNoAdditionalMessage();
 	}
 
 	@Test
@@ -616,7 +613,7 @@ private void assertRestResourceAvailable(String location) throws IOException {
 	}	
 
 	private void deleteAdminAssetShellDescriptor(String aasId) throws ApiException {
-		listener.reset();
+		queue().reset();
 
 		int response = api.deleteAssetAdministrationShellDescriptorByIdWithHttpInfo(URLEncoder.encode(aasId, StandardCharsets.UTF_8)).getStatusCode();
 		assertThat(response).isEqualTo(NO_CONTENT);
@@ -640,7 +637,7 @@ private List<AssetAdministrationShellDescriptor> initialize() throws IOException
 	}
 
 	private void assertThatEventWasSend(RegistryEvent expected) {
-		RegistryEvent evt = listener.poll();
+		RegistryEvent evt = queue().poll();
 		assertThat(evt).isEqualTo(expected);
 	}
 
@@ -674,4 +671,6 @@ private <O,I> O convert(I in, Class<I> inCls, Class<O> outCls) throws JsonProces
 		String data = mapper.writerFor(inCls).writeValueAsString(in);
 		return mapper.readerFor(outCls).readValue(data);
 	}
+
+	public abstract EventQueue queue();
 }

basyx.aasregistry/basyx.aasregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/integration/ClientRegistryTestObjects.java

@@ -31,51 +31,51 @@
 import org.eclipse.digitaltwin.basyx.aasregistry.client.model.ProtocolInformation;
 import org.eclipse.digitaltwin.basyx.aasregistry.client.model.SubmodelDescriptor;
 
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
 public class ClientRegistryTestObjects {
 
-	public AssetAdministrationShellDescriptor newAssetAdministrationShellDescriptor(String id) {
+	private ClientRegistryTestObjects() {
+	}
+
+	public static AssetAdministrationShellDescriptor newAssetAdministrationShellDescriptor(String id) {
 		AssetAdministrationShellDescriptor descriptor = new AssetAdministrationShellDescriptor();
 		descriptor.setId(id);
 		return descriptor;
 	}
 
-	public SubmodelDescriptor newSubmodelDescriptor(String id) {
+	public static SubmodelDescriptor newSubmodelDescriptor(String id) {
 		return newSubmodelDescriptorWithIdShort(id, null);
 	}
 
-	public SubmodelDescriptor newSubmodelDescriptorWithDescription(String id, String description) {
+	public static SubmodelDescriptor newSubmodelDescriptorWithDescription(String id, String description) {
 		SubmodelDescriptor descriptor = new SubmodelDescriptor();
 		descriptor.setId(id);
 		addDescription(descriptor, description);
 		return descriptor;
 	}
 
-	private void addDescription(SubmodelDescriptor descriptor, String description) {
+	private static void addDescription(SubmodelDescriptor descriptor, String description) {
 		if (description != null) {
 			LangStringTextType lString = newDescription(description);
 			descriptor.addDescriptionItem(lString);
 		}
 	}
 
-	private LangStringTextType newDescription(String sDescr) {
+	private static LangStringTextType newDescription(String sDescr) {
 		LangStringTextType descr = new LangStringTextType();
 		descr.setLanguage("de-DE");
 		descr.setText(sDescr);
 		return descr;
 	}
 
-	public SubmodelDescriptor newSubmodelDescriptorWithIdShort(String id, String idShort) {
+	public static SubmodelDescriptor newSubmodelDescriptorWithIdShort(String id, String idShort) {
 		SubmodelDescriptor descriptor = new SubmodelDescriptor();
 		descriptor.setId(id);
 		descriptor.setIdShort(idShort);
 
 		return descriptor;
 	}
 
-	public void addDefaultEndpoint(SubmodelDescriptor descriptor) {
+	public static void addDefaultEndpoint(SubmodelDescriptor descriptor) {
 		Endpoint endpoint = new Endpoint();
 		endpoint.setInterface("https://admin-shell.io/aas/API/3/0/SubmodelServiceSpecification/SSP-003");
 		ProtocolInformation protocolInfo = new ProtocolInformation();

basyx.aasregistry/basyx.aasregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/integration/BaseEventListener.java → basyx.aasregistry/basyx.aasregistry-service-basetests/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/integration/EventQueue.java

@@ -28,17 +28,18 @@
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.digitaltwin.basyx.aasregistry.service.events.RegistryEvent;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public abstract class BaseEventListener {
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class EventQueue {
 
 	private LinkedBlockingQueue<String> messageQueue = new LinkedBlockingQueue<>();
 
-	@Autowired
-	private ObjectMapper mapper;
+	private final ObjectMapper mapper;
 
 	public boolean offer(String message) {
 		return messageQueue.offer(message);
@@ -68,7 +69,7 @@ public void assertNoAdditionalMessage() {
 
 	public RegistryEvent poll() {
 		try {
-			String message = messageQueue.poll(15, TimeUnit.SECONDS);
+			String message = messageQueue.poll(1, TimeUnit.MINUTES);
 			if (message == null) {
 				throw new EventListenerException("timeout");
 			}

basyx.aasregistry/basyx.aasregistry-service-inmemory-storage/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/storage/memory/SearchMatchers.java

@@ -37,13 +37,13 @@
 import org.eclipse.digitaltwin.basyx.aasregistry.model.ShellDescriptorQuery.QueryTypeEnum;
 
 import lombok.RequiredArgsConstructor;
-import lombok.experimental.UtilityClass;
 
-@UtilityClass
 class SearchMatchers {
 
+	private SearchMatchers() {		
+	}
 
-	public Map<String, List<BiPredicate<Object[], String>>> createMatchers(List<ShellDescriptorQuery> queryList) {
+	public static Map<String, List<BiPredicate<Object[], String>>> createMatchers(List<ShellDescriptorQuery> queryList) {
 		Map<String, List<BiPredicate<Object[], String>>> matchers = new HashMap<>();
 		for (ShellDescriptorQuery eachQuery : queryList) {
 			String path = eachQuery.getPath();
@@ -54,7 +54,7 @@ public Map<String, List<BiPredicate<Object[], String>>> createMatchers(List<Shel
 	}
 
 
-	public BiPredicate<Object[], String> createMatcher(ShellDescriptorQuery query) {
+	public static BiPredicate<Object[], String> createMatcher(ShellDescriptorQuery query) {
 		QueryTypeEnum queryType = query.getQueryType();
 		String value = query.getValue();
 

basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/pom.xml

@@ -126,11 +126,6 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>mongodb</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>

basyx.aasregistry/basyx.aasregistry-service-mongodb-storage/src/test/java/org/eclipse/digitaltwin/basyx/aasregistry/service/tests/MongoDbAasRegistryStorageTest.java

@@ -26,9 +26,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.ExecutionException;
 
 import org.bson.Document;
 import org.eclipse.digitaltwin.basyx.aasregistry.model.AssetKind;
@@ -38,46 +36,29 @@
 import org.eclipse.digitaltwin.basyx.aasregistry.service.configuration.MongoDbConfiguration;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.DescriptorFilter;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.ShellDescriptorSearchRequests;
-import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.ShellDescriptorSearchRequests.GroupedQueries;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.mongodb.MongoDbAasRegistryStorage;
 import org.eclipse.digitaltwin.basyx.aasregistry.service.storage.mongodb.SearchQueryBuilder;
-import org.junit.ClassRule;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.TestPropertySource;
-import org.testcontainers.containers.MongoDBContainer;
-import org.testcontainers.utility.DockerImageName;
 
 import com.mongodb.ExplainVerbosity;
 import com.mongodb.client.MongoCollection;
 
-@TestPropertySource(properties = { "registry.type=mongodb", "spring.data.mongodb.database=aasregistry" })
+@TestPropertySource(properties = { "registry.type=mongodb", "spring.data.mongodb.database=aasregistry"
+		, "spring.data.mongodb.uri=mongodb://mongoAdmin:mongoPassword@localhost:27017" })
 @ContextConfiguration(classes = { MongoDbConfiguration.class })
 @EnableAutoConfiguration
 public class MongoDbAasRegistryStorageTest extends AasRegistryStorageTest {
 
-	@Value("${spring.data.mongodb.database}")
-	private static String DATABASE_NAME;
-
-	@ClassRule
-	public static final MongoDBContainer MONGODB_CONTAINER = new MongoDBContainer(DockerImageName.parse("mongo:5.0.10"));
-
 	@Autowired
 	private MongoTemplate template;
 
-	@DynamicPropertySource
-	static void assignAdditionalProperties(DynamicPropertyRegistry registry) throws InterruptedException, ExecutionException {
-		String uri = MONGODB_CONTAINER.getConnectionString() + "/" + DATABASE_NAME;
-		registry.add("spring.data.mongodb.uri", () -> uri);
-	}
 
 	@Test
 	public void whenGetAllByFullFilter_NotAllDocumentsScannedButIndexUsed() {

basyx.aasregistry/basyx.aasregistry-service-release-kafka-mem/pom.xml

@@ -56,11 +56,5 @@
 			<artifactId>basyx.aasregistry-service-basetests</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>kafka</artifactId>
-			<version>${testcontainers.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>