diff --git a/full-backend-tests/src/test/java/org/graylog/datanode/ClientCertResourceIT.java b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/ClientCertResourceIT.java similarity index 99% rename from full-backend-tests/src/test/java/org/graylog/datanode/ClientCertResourceIT.java rename to full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/ClientCertResourceIT.java index a2c5b94cb1ff..ede7fe99d70d 100644 --- a/full-backend-tests/src/test/java/org/graylog/datanode/ClientCertResourceIT.java +++ b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/ClientCertResourceIT.java @@ -14,7 +14,7 @@ * along with this program. If not, see * . */ -package org.graylog.datanode; +package org.graylog.searchbackend.datanode; import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; diff --git a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeOpensearchProxyDisabledAllowlistIT.java b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeOpensearchProxyDisabledAllowlistIT.java similarity index 95% rename from full-backend-tests/src/test/java/org/graylog/datanode/DatanodeOpensearchProxyDisabledAllowlistIT.java rename to full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeOpensearchProxyDisabledAllowlistIT.java index 44382cd8ee21..cef705b5a067 100644 --- a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeOpensearchProxyDisabledAllowlistIT.java +++ b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeOpensearchProxyDisabledAllowlistIT.java @@ -14,9 +14,8 @@ * along with this program. If not, see * . */ -package org.graylog.datanode; +package org.graylog.searchbackend.datanode; -import io.restassured.response.ValidatableResponse; import org.graylog.testing.completebackend.Lifecycle; import org.graylog.testing.completebackend.apis.GraylogApis; import org.graylog.testing.containermatrix.SearchServer; diff --git a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeOpensearchProxyIT.java b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeOpensearchProxyIT.java similarity index 98% rename from full-backend-tests/src/test/java/org/graylog/datanode/DatanodeOpensearchProxyIT.java rename to full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeOpensearchProxyIT.java index 4f206102b895..8cdf4418eadb 100644 --- a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeOpensearchProxyIT.java +++ b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeOpensearchProxyIT.java @@ -14,7 +14,7 @@ * along with this program. If not, see * . */ -package org.graylog.datanode; +package org.graylog.searchbackend.datanode; import com.github.rholder.retry.RetryException; import io.restassured.response.ValidatableResponse; diff --git a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeProvisioningIT.java b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeProvisioningIT.java similarity index 99% rename from full-backend-tests/src/test/java/org/graylog/datanode/DatanodeProvisioningIT.java rename to full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeProvisioningIT.java index 611c05f46ec8..edaf28887045 100644 --- a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeProvisioningIT.java +++ b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeProvisioningIT.java @@ -14,7 +14,7 @@ * along with this program. If not, see * . */ -package org.graylog.datanode; +package org.graylog.searchbackend.datanode; import com.fasterxml.jackson.annotation.JsonProperty; import com.github.joschi.jadconfig.util.Duration; diff --git a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeRestProxyIT.java b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeRestProxyIT.java similarity index 98% rename from full-backend-tests/src/test/java/org/graylog/datanode/DatanodeRestProxyIT.java rename to full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeRestProxyIT.java index 207e7c1eadbb..358dad5a4da3 100644 --- a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeRestProxyIT.java +++ b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeRestProxyIT.java @@ -14,7 +14,7 @@ * along with this program. If not, see * . */ -package org.graylog.datanode; +package org.graylog.searchbackend.datanode; import io.restassured.response.ValidatableResponse; import org.assertj.core.api.Assertions; diff --git a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeSelfsignedStartupIT.java b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeSelfsignedStartupIT.java similarity index 95% rename from full-backend-tests/src/test/java/org/graylog/datanode/DatanodeSelfsignedStartupIT.java rename to full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeSelfsignedStartupIT.java index a48220dbdfc8..602565eed7b4 100644 --- a/full-backend-tests/src/test/java/org/graylog/datanode/DatanodeSelfsignedStartupIT.java +++ b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/DatanodeSelfsignedStartupIT.java @@ -14,7 +14,7 @@ * along with this program. If not, see * . */ -package org.graylog.datanode; +package org.graylog.searchbackend.datanode; import com.github.joschi.jadconfig.util.Duration; import com.github.rholder.retry.RetryException; @@ -33,10 +33,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; import java.util.concurrent.ExecutionException; @ContainerMatrixTestsConfiguration(serverLifecycle = Lifecycle.CLASS, searchVersions = SearchServer.DATANODE_DEV, diff --git a/full-backend-tests/src/test/java/org/graylog/datanode/RemoteReindexingMigrationIT.java b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/RemoteReindexingMigrationIT.java similarity index 99% rename from full-backend-tests/src/test/java/org/graylog/datanode/RemoteReindexingMigrationIT.java rename to full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/RemoteReindexingMigrationIT.java index 1e5835a9cbaf..c3c54a7249b7 100644 --- a/full-backend-tests/src/test/java/org/graylog/datanode/RemoteReindexingMigrationIT.java +++ b/full-backend-tests/src/test/java/org/graylog/searchbackend/datanode/RemoteReindexingMigrationIT.java @@ -14,7 +14,7 @@ * along with this program. If not, see * . */ -package org.graylog.datanode; +package org.graylog.searchbackend.datanode; import com.github.rholder.retry.Attempt; import com.github.rholder.retry.RetryException; diff --git a/full-backend-tests/src/test/java/org/graylog/elasticsearch/e2e/ElasticsearchE2E.java b/full-backend-tests/src/test/java/org/graylog/searchbackend/elasticsearch/e2e/ElasticsearchE2E.java similarity index 97% rename from full-backend-tests/src/test/java/org/graylog/elasticsearch/e2e/ElasticsearchE2E.java rename to full-backend-tests/src/test/java/org/graylog/searchbackend/elasticsearch/e2e/ElasticsearchE2E.java index e64e1c79a94a..6f8228615637 100644 --- a/full-backend-tests/src/test/java/org/graylog/elasticsearch/e2e/ElasticsearchE2E.java +++ b/full-backend-tests/src/test/java/org/graylog/searchbackend/elasticsearch/e2e/ElasticsearchE2E.java @@ -14,7 +14,7 @@ * along with this program. If not, see * . */ -package org.graylog.elasticsearch.e2e; +package org.graylog.searchbackend.elasticsearch.e2e; import org.graylog.testing.completebackend.apis.GraylogApis; import org.graylog.testing.containermatrix.annotations.ContainerMatrixTest;