You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2024/03/25 12:10:02 UTC
(camel) branch main updated: test-infra: use official testcontainer qdrant module (#13604)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new fa1107ec0c7 test-infra: use official testcontainer qdrant module (#13604)
fa1107ec0c7 is described below
commit fa1107ec0c740d54ff33ded9abfb414d27eaf250
Author: Luca Burgazzoli <lb...@users.noreply.github.com>
AuthorDate: Mon Mar 25 13:09:55 2024 +0100
test-infra: use official testcontainer qdrant module (#13604)
---
test-infra/camel-test-infra-qdrant/pom.xml | 5 ++
.../infra/qdrant/services/QdrantContainer.java | 57 ----------------------
.../services/QdrantLocalContainerService.java | 14 ++++--
3 files changed, 15 insertions(+), 61 deletions(-)
diff --git a/test-infra/camel-test-infra-qdrant/pom.xml b/test-infra/camel-test-infra-qdrant/pom.xml
index 3cca20e8870..b8a82c4b008 100644
--- a/test-infra/camel-test-infra-qdrant/pom.xml
+++ b/test-infra/camel-test-infra-qdrant/pom.xml
@@ -44,6 +44,11 @@
<artifactId>testcontainers</artifactId>
<version>${testcontainers-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>qdrant</artifactId>
+ <version>${testcontainers-version}</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantContainer.java b/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantContainer.java
deleted file mode 100644
index c6e41ba3dbb..00000000000
--- a/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantContainer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.test.infra.qdrant.services;
-
-import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.utility.DockerImageName;
-
-public class QdrantContainer extends GenericContainer<QdrantContainer> {
- public static final int HTTP_PORT = 6333;
- public static final int GRPC_PORT = 6334;
-
- public QdrantContainer(DockerImageName imageName) {
- super(imageName);
- }
-
- @Override
- protected void configure() {
- super.configure();
-
- withExposedPorts(HTTP_PORT, GRPC_PORT)
- .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(QdrantContainer.class)))
- .waitingFor(Wait.forLogMessage(".*Actix runtime found; starting in Actix runtime.*", 1));
- }
-
- public String getGrpcHost() {
- return getHost();
- }
-
- public int getGrpcPort() {
- return getMappedPort(GRPC_PORT);
- }
-
- public String getHttpHost() {
- return getHost();
- }
-
- public int getHttpPort() {
- return getMappedPort(HTTP_PORT);
- }
-}
diff --git a/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerService.java b/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerService.java
index 38c3f14158b..cd4b6bd0f1d 100644
--- a/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerService.java
+++ b/test-infra/camel-test-infra-qdrant/src/test/java/org/apache/camel/test/infra/qdrant/services/QdrantLocalContainerService.java
@@ -21,9 +21,14 @@ import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.qdrant.common.QdrantProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.qdrant.QdrantContainer;
import org.testcontainers.utility.DockerImageName;
public class QdrantLocalContainerService implements QdrantService, ContainerService<QdrantContainer> {
+ public static final int HTTP_PORT = 6333;
+ public static final int GRPC_PORT = 6334;
+
private static final Logger LOG = LoggerFactory.getLogger(QdrantLocalContainerService.class);
private final QdrantContainer container;
@@ -50,6 +55,7 @@ public class QdrantLocalContainerService implements QdrantService, ContainerServ
public void initialize() {
LOG.info("Trying to start the Qdrant container");
+ container.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(QdrantContainer.class)));
container.start();
registerProperties();
@@ -70,21 +76,21 @@ public class QdrantLocalContainerService implements QdrantService, ContainerServ
@Override
public String getHttpHost() {
- return container.getHttpHost();
+ return container.getHost();
}
@Override
public int getHttpPort() {
- return container.getHttpPort();
+ return container.getMappedPort(HTTP_PORT);
}
@Override
public String getGrpcHost() {
- return container.getGrpcHost();
+ return container.getHost();
}
@Override
public int getGrpcPort() {
- return container.getGrpcPort();
+ return container.getMappedPort(GRPC_PORT);
}
}