diff --git a/servers/quarkus-server/src/test/java/org/projectnessie/server/catalog/TestCommitMetaHeaders.java b/servers/quarkus-server/src/test/java/org/projectnessie/server/catalog/TestCommitMetaHeaders.java index 2724c0fbdf5..624f4058677 100644 --- a/servers/quarkus-server/src/test/java/org/projectnessie/server/catalog/TestCommitMetaHeaders.java +++ b/servers/quarkus-server/src/test/java/org/projectnessie/server/catalog/TestCommitMetaHeaders.java @@ -16,7 +16,7 @@ package org.projectnessie.server.catalog; import static org.apache.iceberg.types.Types.NestedField.required; -import static org.projectnessie.server.catalog.AbstractIcebergCatalogTests.EMPTY_OBJ_ID; +import static org.projectnessie.server.catalog.IcebergCatalogTestCommon.EMPTY_OBJ_ID; import static org.projectnessie.server.catalog.IcebergCatalogTestCommon.WAREHOUSE_NAME; import io.quarkus.test.junit.QuarkusTest; diff --git a/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/AbstractIcebergCatalogTests.java b/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/AbstractIcebergCatalogTests.java index 07fe371c8b3..b6c421d7934 100644 --- a/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/AbstractIcebergCatalogTests.java +++ b/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/AbstractIcebergCatalogTests.java @@ -20,6 +20,7 @@ import static java.util.Collections.singletonMap; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.projectnessie.server.catalog.IcebergCatalogTestCommon.EMPTY_OBJ_ID; import static org.projectnessie.server.catalog.IcebergCatalogTestCommon.WAREHOUSE_NAME; import com.google.common.collect.ImmutableMap; @@ -83,8 +84,6 @@ import org.projectnessie.model.Reference; public abstract class AbstractIcebergCatalogTests extends CatalogTests { - public static final String EMPTY_OBJ_ID = - "2e1cfa82b035c26cbbbdae632cea070514eb8b773f616aaeaf668e2f0be8f10d"; private static final Catalogs CATALOGS = new Catalogs(); diff --git a/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/AbstractIcebergViewCatalogTests.java b/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/AbstractIcebergViewCatalogTests.java index 017ac93a08b..2656ac195f2 100644 --- a/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/AbstractIcebergViewCatalogTests.java +++ b/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/AbstractIcebergViewCatalogTests.java @@ -16,6 +16,7 @@ package org.projectnessie.server.catalog; import static java.util.Collections.singletonMap; +import static org.projectnessie.server.catalog.IcebergCatalogTestCommon.EMPTY_OBJ_ID; import static org.projectnessie.server.catalog.IcebergCatalogTestCommon.WAREHOUSE_NAME; import java.util.Map; @@ -30,8 +31,6 @@ import org.projectnessie.model.Reference; public abstract class AbstractIcebergViewCatalogTests extends ViewCatalogTests { - public static final String EMPTY_OBJ_ID = - "2e1cfa82b035c26cbbbdae632cea070514eb8b773f616aaeaf668e2f0be8f10d"; private static final Catalogs CATALOGS = new Catalogs(); diff --git a/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/IcebergCatalogTestCommon.java b/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/IcebergCatalogTestCommon.java index 84b8484a132..735892ff25a 100644 --- a/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/IcebergCatalogTestCommon.java +++ b/servers/quarkus-server/src/testFixtures/java/org/projectnessie/server/catalog/IcebergCatalogTestCommon.java @@ -17,4 +17,5 @@ public interface IcebergCatalogTestCommon { String WAREHOUSE_NAME = "warehouse1"; + String EMPTY_OBJ_ID = "2e1cfa82b035c26cbbbdae632cea070514eb8b773f616aaeaf668e2f0be8f10d"; }