mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Add container support for Oracle Free which replaces Oracle XE
Update Docker Compose and Testcontainers support to work with `gvenzl/oracle-free` which replaces `gvenzl/oracle-xe`. Closes gh-38476
This commit is contained in:
parent
0897d752bc
commit
6c3dec42e0
@ -16,28 +16,33 @@
|
||||
|
||||
package org.springframework.boot.docker.compose.service.connection;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Set;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.springframework.boot.docker.compose.core.ImageReference;
|
||||
import org.springframework.boot.docker.compose.core.RunningService;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
* {@link Predicate} that matches against connection names.
|
||||
* {@link Predicate} that matches against connection name.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
*/
|
||||
class ConnectionNamePredicate implements Predicate<DockerComposeConnectionSource> {
|
||||
|
||||
private final String required;
|
||||
private final Set<String> required;
|
||||
|
||||
ConnectionNamePredicate(String required) {
|
||||
this.required = asCanonicalName(required);
|
||||
ConnectionNamePredicate(String... required) {
|
||||
Assert.notEmpty(required, "Required must not be empty");
|
||||
this.required = Arrays.stream(required).map(this::asCanonicalName).collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean test(DockerComposeConnectionSource source) {
|
||||
String actual = getActual(source.getRunningService());
|
||||
return this.required.equals(actual);
|
||||
return this.required.contains(actual);
|
||||
}
|
||||
|
||||
private String getActual(RunningService service) {
|
||||
|
@ -54,6 +54,16 @@ public abstract class DockerComposeConnectionDetailsFactory<D extends Connection
|
||||
this(new ConnectionNamePredicate(connectionName), requiredClassNames);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new {@link DockerComposeConnectionDetailsFactory} instance.
|
||||
* @param connectionNames the required connection name
|
||||
* @param requiredClassNames the names of classes that must be present
|
||||
* @since 3.2.0
|
||||
*/
|
||||
protected DockerComposeConnectionDetailsFactory(String[] connectionNames, String... requiredClassNames) {
|
||||
this(new ConnectionNamePredicate(connectionNames), requiredClassNames);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new {@link DockerComposeConnectionDetailsFactory} instance.
|
||||
* @param predicate a predicate used to check when a service is accepted
|
||||
|
@ -28,6 +28,8 @@ import org.springframework.util.StringUtils;
|
||||
*/
|
||||
class OracleEnvironment {
|
||||
|
||||
static final String[] CONTAINER_NAMES = { "gvenzl/oracle-xe", "gvenzl/oracle-free" };
|
||||
|
||||
private final String username;
|
||||
|
||||
private final String password;
|
||||
|
@ -34,7 +34,7 @@ class OracleJdbcDockerComposeConnectionDetailsFactory
|
||||
extends DockerComposeConnectionDetailsFactory<JdbcConnectionDetails> {
|
||||
|
||||
protected OracleJdbcDockerComposeConnectionDetailsFactory() {
|
||||
super("gvenzl/oracle-xe");
|
||||
super(OracleEnvironment.CONTAINER_NAMES);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -36,7 +36,7 @@ class OracleR2dbcDockerComposeConnectionDetailsFactory
|
||||
extends DockerComposeConnectionDetailsFactory<R2dbcConnectionDetails> {
|
||||
|
||||
OracleR2dbcDockerComposeConnectionDetailsFactory() {
|
||||
super("gvenzl/oracle-xe", "io.r2dbc.spi.ConnectionFactoryOptions");
|
||||
super(OracleEnvironment.CONTAINER_NAMES, "io.r2dbc.spi.ConnectionFactoryOptions");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -74,7 +74,14 @@ class ConnectionNamePredicateTests {
|
||||
.accepts(sourceOf("internalhost:8080/libs/libs/mzipkin", "openzipkin/zipkin"));
|
||||
}
|
||||
|
||||
private Predicate<DockerComposeConnectionSource> predicateOf(String required) {
|
||||
@Test
|
||||
void multiple() {
|
||||
assertThat(predicateOf("elasticsearch1", "elasticsearch2")).accepts(sourceOf("elasticsearch1"))
|
||||
.accepts(sourceOf("elasticsearch2"));
|
||||
|
||||
}
|
||||
|
||||
private Predicate<DockerComposeConnectionSource> predicateOf(String... required) {
|
||||
return new ConnectionNamePredicate(required);
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,71 @@
|
||||
/*
|
||||
* Copyright 2012-2023 the original author or authors.
|
||||
*
|
||||
* Licensed 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
|
||||
*
|
||||
* https://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.springframework.boot.docker.compose.service.connection.oracle;
|
||||
|
||||
import java.sql.Driver;
|
||||
import java.time.Duration;
|
||||
|
||||
import org.awaitility.Awaitility;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.OS;
|
||||
|
||||
import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
|
||||
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
|
||||
import org.springframework.boot.jdbc.DatabaseDriver;
|
||||
import org.springframework.boot.testsupport.junit.DisabledOnOs;
|
||||
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.jdbc.datasource.SimpleDriverDataSource;
|
||||
import org.springframework.util.ClassUtils;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Integration tests for {@link OracleJdbcDockerComposeConnectionDetailsFactory}
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
|
||||
disabledReason = "The Oracle image has no ARM support")
|
||||
class OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests
|
||||
extends AbstractDockerComposeIntegrationTests {
|
||||
|
||||
OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests() {
|
||||
super("oracle-compose.yaml", DockerImageNames.oracleFree());
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void runCreatesConnectionDetailsThatCanBeUsedToAccessDatabase() throws Exception {
|
||||
JdbcConnectionDetails connectionDetails = run(JdbcConnectionDetails.class);
|
||||
assertThat(connectionDetails.getUsername()).isEqualTo("app_user");
|
||||
assertThat(connectionDetails.getPassword()).isEqualTo("app_user_secret");
|
||||
assertThat(connectionDetails.getJdbcUrl()).startsWith("jdbc:oracle:thin:@").endsWith("/xepdb1");
|
||||
SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
|
||||
dataSource.setUrl(connectionDetails.getJdbcUrl());
|
||||
dataSource.setUsername(connectionDetails.getUsername());
|
||||
dataSource.setPassword(connectionDetails.getPassword());
|
||||
dataSource.setDriverClass((Class<? extends Driver>) ClassUtils.forName(connectionDetails.getDriverClassName(),
|
||||
getClass().getClassLoader()));
|
||||
Awaitility.await().atMost(Duration.ofMinutes(1)).ignoreExceptions().untilAsserted(() -> {
|
||||
JdbcTemplate template = new JdbcTemplate(dataSource);
|
||||
assertThat(template.queryForObject(DatabaseDriver.ORACLE.getValidationQuery(), String.class))
|
||||
.isEqualTo("Hello");
|
||||
});
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,68 @@
|
||||
/*
|
||||
* Copyright 2012-2023 the original author or authors.
|
||||
*
|
||||
* Licensed 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
|
||||
*
|
||||
* https://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.springframework.boot.docker.compose.service.connection.oracle;
|
||||
|
||||
import java.time.Duration;
|
||||
|
||||
import io.r2dbc.spi.ConnectionFactories;
|
||||
import io.r2dbc.spi.ConnectionFactoryOptions;
|
||||
import org.awaitility.Awaitility;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.OS;
|
||||
|
||||
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
|
||||
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
|
||||
import org.springframework.boot.jdbc.DatabaseDriver;
|
||||
import org.springframework.boot.testsupport.junit.DisabledOnOs;
|
||||
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
|
||||
import org.springframework.r2dbc.core.DatabaseClient;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Integration tests for {@link OracleR2dbcDockerComposeConnectionDetailsFactory}
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
|
||||
disabledReason = "The Oracle image has no ARM support")
|
||||
class OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests
|
||||
extends AbstractDockerComposeIntegrationTests {
|
||||
|
||||
OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests() {
|
||||
super("oracle-compose.yaml", DockerImageNames.oracleFree());
|
||||
}
|
||||
|
||||
@Test
|
||||
void runCreatesConnectionDetailsThatCanBeUsedToAccessDatabase() {
|
||||
R2dbcConnectionDetails connectionDetails = run(R2dbcConnectionDetails.class);
|
||||
ConnectionFactoryOptions connectionFactoryOptions = connectionDetails.getConnectionFactoryOptions();
|
||||
assertThat(connectionFactoryOptions.toString()).contains("database=xepdb1", "driver=oracle",
|
||||
"password=REDACTED", "user=app_user");
|
||||
assertThat(connectionFactoryOptions.getRequiredValue(ConnectionFactoryOptions.PASSWORD))
|
||||
.isEqualTo("app_user_secret");
|
||||
Awaitility.await().atMost(Duration.ofMinutes(1)).ignoreExceptions().untilAsserted(() -> {
|
||||
Object result = DatabaseClient.create(ConnectionFactories.get(connectionFactoryOptions))
|
||||
.sql(DatabaseDriver.ORACLE.getValidationQuery())
|
||||
.map((row, metadata) -> row.get(0))
|
||||
.first()
|
||||
.block(Duration.ofSeconds(30));
|
||||
assertThat(result).isEqualTo("Hello");
|
||||
});
|
||||
}
|
||||
|
||||
}
|
@ -41,9 +41,9 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
*/
|
||||
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
|
||||
disabledReason = "The Oracle image has no ARM support")
|
||||
class OracleJdbcDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
|
||||
class OracleXeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
|
||||
|
||||
OracleJdbcDockerComposeConnectionDetailsFactoryIntegrationTests() {
|
||||
OracleXeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests() {
|
||||
super("oracle-compose.yaml", DockerImageNames.oracleXe());
|
||||
}
|
||||
|
@ -40,9 +40,9 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
*/
|
||||
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
|
||||
disabledReason = "The Oracle image has no ARM support")
|
||||
class OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
|
||||
class OracleXeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
|
||||
|
||||
OracleR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests() {
|
||||
OracleXeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests() {
|
||||
super("oracle-compose.yaml", DockerImageNames.oracleXe());
|
||||
}
|
||||
|
@ -74,7 +74,7 @@ The following service connections are currently supported:
|
||||
| Containers named "elasticsearch"
|
||||
|
||||
| `JdbcConnectionDetails`
|
||||
| Containers named "gvenzl/oracle-xe", "mariadb", "mssql/server", "mysql", or "postgres"
|
||||
| Containers named "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "mssql/server", "mysql", or "postgres"
|
||||
|
||||
| `MongoConnectionDetails`
|
||||
| Containers named "mongo"
|
||||
@ -92,7 +92,7 @@ The following service connections are currently supported:
|
||||
| Containers named "apachepulsar/pulsar"
|
||||
|
||||
| `R2dbcConnectionDetails`
|
||||
| Containers named "gvenzl/oracle-xe", "mariadb", "mssql/server", "mysql", or "postgres"
|
||||
| Containers named "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "mssql/server", "mysql", or "postgres"
|
||||
|
||||
| `RabbitConnectionDetails`
|
||||
| Containers named "rabbitmq"
|
||||
|
@ -29,6 +29,7 @@ dependencies {
|
||||
optional("org.testcontainers:mysql")
|
||||
optional("org.testcontainers:neo4j")
|
||||
optional("org.testcontainers:oracle-xe")
|
||||
optional("org.testcontainers:oracle-free")
|
||||
optional("org.testcontainers:postgresql")
|
||||
optional("org.testcontainers:pulsar")
|
||||
optional("org.testcontainers:rabbitmq")
|
||||
|
@ -0,0 +1,63 @@
|
||||
/*
|
||||
* Copyright 2012-2023 the original author or authors.
|
||||
*
|
||||
* Licensed 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
|
||||
*
|
||||
* https://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.springframework.boot.testcontainers.service.connection.r2dbc;
|
||||
|
||||
import io.r2dbc.spi.ConnectionFactoryOptions;
|
||||
import org.testcontainers.oracle.OracleContainer;
|
||||
import org.testcontainers.oracle.OracleR2DBCDatabaseContainer;
|
||||
|
||||
import org.springframework.boot.autoconfigure.r2dbc.R2dbcConnectionDetails;
|
||||
import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory;
|
||||
import org.springframework.boot.testcontainers.service.connection.ContainerConnectionSource;
|
||||
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
|
||||
|
||||
/**
|
||||
* {@link ContainerConnectionDetailsFactory} to create {@link R2dbcConnectionDetails} from
|
||||
* a {@link ServiceConnection @ServiceConnection}-annotated {@link OracleContainer}.
|
||||
*
|
||||
* @author Eddú Meléndez
|
||||
*/
|
||||
class OracleFreeR2dbcContainerConnectionDetailsFactory
|
||||
extends ContainerConnectionDetailsFactory<OracleContainer, R2dbcConnectionDetails> {
|
||||
|
||||
OracleFreeR2dbcContainerConnectionDetailsFactory() {
|
||||
super(ANY_CONNECTION_NAME, "io.r2dbc.spi.ConnectionFactoryOptions");
|
||||
}
|
||||
|
||||
@Override
|
||||
public R2dbcConnectionDetails getContainerConnectionDetails(ContainerConnectionSource<OracleContainer> source) {
|
||||
return new R2dbcDatabaseContainerConnectionDetails(source);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@link R2dbcConnectionDetails} backed by a {@link ContainerConnectionSource}.
|
||||
*/
|
||||
private static final class R2dbcDatabaseContainerConnectionDetails
|
||||
extends ContainerConnectionDetails<OracleContainer> implements R2dbcConnectionDetails {
|
||||
|
||||
private R2dbcDatabaseContainerConnectionDetails(ContainerConnectionSource<OracleContainer> source) {
|
||||
super(source);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ConnectionFactoryOptions getConnectionFactoryOptions() {
|
||||
return OracleR2DBCDatabaseContainer.getOptions(getContainer());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
@ -31,10 +31,10 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect
|
||||
*
|
||||
* @author Eddú Meléndez
|
||||
*/
|
||||
class OracleR2dbcContainerConnectionDetailsFactory
|
||||
class OracleXeR2dbcContainerConnectionDetailsFactory
|
||||
extends ContainerConnectionDetailsFactory<OracleContainer, R2dbcConnectionDetails> {
|
||||
|
||||
OracleR2dbcContainerConnectionDetailsFactory() {
|
||||
OracleXeR2dbcContainerConnectionDetailsFactory() {
|
||||
super(ANY_CONNECTION_NAME, "io.r2dbc.spi.ConnectionFactoryOptions");
|
||||
}
|
||||
|
@ -24,7 +24,8 @@ org.springframework.boot.testcontainers.service.connection.otlp.OpenTelemetryTra
|
||||
org.springframework.boot.testcontainers.service.connection.pulsar.PulsarContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.r2dbc.MariaDbR2dbcContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.r2dbc.MySqlR2dbcContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.r2dbc.OracleR2dbcContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.r2dbc.OracleFreeR2dbcContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.r2dbc.OracleXeR2dbcContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.r2dbc.PostgresR2dbcContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.r2dbc.SqlServerR2dbcContainerConnectionDetailsFactory,\
|
||||
org.springframework.boot.testcontainers.service.connection.redis.RedisContainerConnectionDetailsFactory,\
|
||||
|
@ -0,0 +1,86 @@
|
||||
/*
|
||||
* Copyright 2012-2023 the original author or authors.
|
||||
*
|
||||
* Licensed 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
|
||||
*
|
||||
* https://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.springframework.boot.testcontainers.service.connection.r2dbc;
|
||||
|
||||
import java.time.Duration;
|
||||
|
||||
import io.r2dbc.spi.ConnectionFactory;
|
||||
import io.r2dbc.spi.ConnectionFactoryOptions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.OS;
|
||||
import org.testcontainers.junit.jupiter.Container;
|
||||
import org.testcontainers.junit.jupiter.Testcontainers;
|
||||
import org.testcontainers.oracle.OracleContainer;
|
||||
|
||||
import org.springframework.aot.hint.RuntimeHints;
|
||||
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
|
||||
import org.springframework.boot.jdbc.DatabaseDriver;
|
||||
import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactoryHints;
|
||||
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
|
||||
import org.springframework.boot.testsupport.junit.DisabledOnOs;
|
||||
import org.springframework.boot.testsupport.testcontainers.DockerImageNames;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.r2dbc.core.DatabaseClient;
|
||||
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for {@link OracleFreeR2dbcContainerConnectionDetailsFactory}.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
@SpringJUnitConfig
|
||||
@Testcontainers(disabledWithoutDocker = true)
|
||||
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
|
||||
disabledReason = "The Oracle image has no ARM support")
|
||||
class OracleFreeR2dbcContainerConnectionDetailsFactoryTests {
|
||||
|
||||
@Container
|
||||
@ServiceConnection
|
||||
static final OracleContainer oracle = new OracleContainer(DockerImageNames.oracleFree())
|
||||
.withStartupTimeout(Duration.ofMinutes(2));
|
||||
|
||||
@Autowired
|
||||
ConnectionFactory connectionFactory;
|
||||
|
||||
@Test
|
||||
void connectionCanBeMadeToOracleContainer() {
|
||||
Object result = DatabaseClient.create(this.connectionFactory)
|
||||
.sql(DatabaseDriver.ORACLE.getValidationQuery())
|
||||
.map((row, metadata) -> row.get(0))
|
||||
.first()
|
||||
.block(Duration.ofSeconds(30));
|
||||
assertThat(result).isEqualTo("Hello");
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldRegisterHints() {
|
||||
RuntimeHints hints = ContainerConnectionDetailsFactoryHints.getRegisteredHints(getClass().getClassLoader());
|
||||
assertThat(RuntimeHintsPredicates.reflection().onType(ConnectionFactoryOptions.class)).accepts(hints);
|
||||
}
|
||||
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
@ImportAutoConfiguration(R2dbcAutoConfiguration.class)
|
||||
static class TestConfiguration {
|
||||
|
||||
}
|
||||
|
||||
}
|
@ -43,7 +43,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Tests for {@link OracleR2dbcContainerConnectionDetailsFactory}.
|
||||
* Tests for {@link OracleXeR2dbcContainerConnectionDetailsFactory}.
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
@ -51,7 +51,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
@Testcontainers(disabledWithoutDocker = true)
|
||||
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
|
||||
disabledReason = "The Oracle image has no ARM support")
|
||||
class OracleR2dbcContainerConnectionDetailsFactoryTests {
|
||||
class OracleXeR2dbcContainerConnectionDetailsFactoryTests {
|
||||
|
||||
@Container
|
||||
@ServiceConnection
|
@ -48,6 +48,8 @@ public final class DockerImageNames {
|
||||
|
||||
private static final String NEO4J_VERSION = "4.4.11";
|
||||
|
||||
private static final String ORACLE_FREE_VERSION = "23.3-slim";
|
||||
|
||||
private static final String ORACLE_XE_VERSION = "18.4.0-slim";
|
||||
|
||||
private static final String OPENTELEMETRY_VERSION = "0.75.0";
|
||||
@ -149,6 +151,14 @@ public final class DockerImageNames {
|
||||
return DockerImageName.parse("neo4j").withTag(NEO4J_VERSION);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a {@link DockerImageName} suitable for running the Oracle database.
|
||||
* @return a docker image name for running the Oracle database
|
||||
*/
|
||||
public static DockerImageName oracleFree() {
|
||||
return DockerImageName.parse("gvenzl/oracle-free").withTag(ORACLE_FREE_VERSION);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a {@link DockerImageName} suitable for running the Oracle database.
|
||||
* @return a docker image name for running the Oracle database
|
||||
|
Loading…
Reference in New Issue
Block a user