From c4b954037b8807289b01708b015e2cc3c72ab29d Mon Sep 17 00:00:00 2001 From: Tadgh Date: Mon, 30 Sep 2024 11:36:51 -0400 Subject: [PATCH] conflicts --- .../HapiEmbeddedDatabasesExtension.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/embedded/HapiEmbeddedDatabasesExtension.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/embedded/HapiEmbeddedDatabasesExtension.java index 87e656d4ca0d..8619d3db0a80 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/embedded/HapiEmbeddedDatabasesExtension.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/embedded/HapiEmbeddedDatabasesExtension.java @@ -23,8 +23,6 @@ import ca.uhn.fhir.jpa.util.DatabaseSupportUtil; import ca.uhn.fhir.test.utilities.docker.DockerRequiredCondition; import ca.uhn.fhir.util.VersionEnum; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.SystemUtils; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.provider.Arguments; @@ -146,21 +144,4 @@ public Stream provideArguments(ExtensionContext context) { return arguments.stream(); } } - - private static boolean canUseOracle() { - if (!isMac()) { - return true; - } - return isColimaConfigured(); - } - - private static boolean isMac() { - return SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_MAC_OSX; - } - - private static boolean isColimaConfigured() { - return StringUtils.isNotBlank(System.getenv("TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE")) - && StringUtils.isNotBlank(System.getenv("DOCKER_HOST")) - && System.getenv("DOCKER_HOST").contains("colima"); - } }