-
Notifications
You must be signed in to change notification settings - Fork 40.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
18 changed files
with
343 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
...onnection/oracle/OracleFreeJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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"); | ||
| }); | ||
| } | ||
|
|
||
| } |
68 changes: 68 additions & 0 deletions
68
...nnection/oracle/OracleFreeR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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"); | ||
| }); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
...containers/service/connection/r2dbc/OracleFreeR2dbcContainerConnectionDetailsFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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()); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.