executeBatch(
* {@link PreparedStatement#addBatch()},
*
* @param jdbcStatement A JDBC statement
- * @param batch A batch of bind values
+ * @param bindValues A set of bind values
* @return A publisher that emits the {@code Results} of executing the
* JDBC statement for each set of bind values in the {@code batch}
*/
diff --git a/src/main/java/oracle/r2dbc/impl/ReactiveJdbcAdapter.java b/src/main/java/oracle/r2dbc/impl/ReactiveJdbcAdapter.java
index cdef83d..ec0c429 100755
--- a/src/main/java/oracle/r2dbc/impl/ReactiveJdbcAdapter.java
+++ b/src/main/java/oracle/r2dbc/impl/ReactiveJdbcAdapter.java
@@ -37,7 +37,6 @@
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.function.Function;
diff --git a/src/test/java/oracle/r2dbc/OracleTestKit.java b/src/test/java/oracle/r2dbc/OracleTestKit.java
index 5ab4af3..04ba872 100755
--- a/src/test/java/oracle/r2dbc/OracleTestKit.java
+++ b/src/test/java/oracle/r2dbc/OracleTestKit.java
@@ -26,10 +26,11 @@
import io.r2dbc.spi.*;
import io.r2dbc.spi.test.TestKit;
-import oracle.r2dbc.util.OracleTestKitSupport;
+import oracle.jdbc.datasource.OracleDataSource;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.support.AbstractLobCreatingPreparedStatementCallback;
import org.springframework.jdbc.support.lob.DefaultLobHandler;
import org.springframework.jdbc.support.lob.LobCreator;
@@ -46,7 +47,17 @@
import java.util.Collection;
import java.util.function.Function;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static io.r2dbc.spi.ConnectionFactoryOptions.DATABASE;
+import static io.r2dbc.spi.ConnectionFactoryOptions.DRIVER;
+import static io.r2dbc.spi.ConnectionFactoryOptions.HOST;
+import static io.r2dbc.spi.ConnectionFactoryOptions.PASSWORD;
+import static io.r2dbc.spi.ConnectionFactoryOptions.PORT;
+import static io.r2dbc.spi.ConnectionFactoryOptions.USER;
+import static oracle.r2dbc.DatabaseConfig.host;
+import static oracle.r2dbc.DatabaseConfig.password;
+import static oracle.r2dbc.DatabaseConfig.port;
+import static oracle.r2dbc.DatabaseConfig.serviceName;
+import static oracle.r2dbc.DatabaseConfig.user;
/**
*
@@ -73,13 +84,38 @@
* @author harayuanwang, Michael-A-McMahon
* @since 0.1.0
*/
-public class OracleTestKit
- extends OracleTestKitSupport implements TestKit {
+public class OracleTestKit implements TestKit {
+
+ private final JdbcOperations jdbcOperations;
+ {
+ try {
+ OracleDataSource dataSource = new oracle.jdbc.pool.OracleDataSource();
+ dataSource.setURL(String.format("jdbc:oracle:thin:@%s:%d/%s",
+ host(), port(), serviceName()));
+ dataSource.setUser(user());
+ dataSource.setPassword(password());
+ this.jdbcOperations = new JdbcTemplate(dataSource);
+ }
+ catch (SQLException sqlException) {
+ throw new RuntimeException(sqlException);
+ }
+ }
- static Mono close(Connection connection) {
- return Mono.from(connection
- .close())
- .then(Mono.empty());
+ private final ConnectionFactory connectionFactory;
+ {
+ connectionFactory = ConnectionFactories.get(
+ ConnectionFactoryOptions.builder()
+ .option(DRIVER, "oracle")
+ .option(DATABASE, serviceName())
+ .option(HOST, host())
+ .option(PORT, port())
+ .option(PASSWORD, password())
+ .option(USER, user())
+ .build());
+ }
+
+ public JdbcOperations getJdbcOperations() {
+ return jdbcOperations;
}
@Override
@@ -108,17 +144,6 @@ public Integer getIdentifier(int index) {
return index;
}
- @Override
- public JdbcOperations getJdbcOperations() {
- JdbcOperations jdbcOperations = CONFIG.getJDBCOperations();
-
- if (jdbcOperations == null) {
- throw new IllegalStateException("JdbcOperations not yet initialized");
- }
-
- return jdbcOperations;
- }
-
/**
* {@inheritDoc}
*
@@ -402,7 +427,6 @@ protected void setValues(PreparedStatement ps, LobCreator lobCreator) throws SQL
.verifyComplete();
}
-
@Disabled("Compound statements are not supported by Oracle Database")
@Test
@Override
@@ -418,6 +442,11 @@ public void savePoint() {}
@Override
public void savePointStartsTransaction() {}
+ static Mono close(Connection connection) {
+ return Mono.from(connection.close())
+ .then(Mono.empty());
+ }
+
}
/*
diff --git a/src/test/java/oracle/r2dbc/impl/OracleResultImplTest.java b/src/test/java/oracle/r2dbc/impl/OracleResultImplTest.java
index 0121cfa..aad008b 100644
--- a/src/test/java/oracle/r2dbc/impl/OracleResultImplTest.java
+++ b/src/test/java/oracle/r2dbc/impl/OracleResultImplTest.java
@@ -30,7 +30,6 @@
import reactor.core.publisher.Mono;
import reactor.core.publisher.Signal;
-import java.util.Arrays;
import java.util.List;
import java.util.function.BiFunction;
@@ -42,7 +41,6 @@
import static oracle.r2dbc.util.Awaits.awaitMany;
import static oracle.r2dbc.util.Awaits.awaitNone;
import static oracle.r2dbc.util.Awaits.awaitOne;
-import static oracle.r2dbc.util.Awaits.awaitUpdate;
import static org.junit.jupiter.api.Assertions.*;
/**
@@ -50,14 +48,14 @@
* {@link OracleResultImpl} implements behavior that is specified in it's
* class and method level javadocs.
*/
-class OracleResultImplTest {
+public class OracleResultImplTest {
/**
* Verifies the implementation of
* {@link OracleResultImpl#getRowsUpdated()}
*/
@Test
- void testGetRowsUpdated() {
+ public void testGetRowsUpdated() {
Connection connection =
Mono.from(sharedConnection()).block(connectTimeout());
try {
@@ -178,7 +176,7 @@ void testGetRowsUpdated() {
* {@link OracleResultImpl#map(BiFunction)}
*/
@Test
- void testMap() {
+ public void testMap() {
Connection connection =
Mono.from(sharedConnection()).block(connectTimeout());
try {
diff --git a/src/test/java/oracle/r2dbc/impl/OracleStatementImplTest.java b/src/test/java/oracle/r2dbc/impl/OracleStatementImplTest.java
index d05811a..9707f4d 100644
--- a/src/test/java/oracle/r2dbc/impl/OracleStatementImplTest.java
+++ b/src/test/java/oracle/r2dbc/impl/OracleStatementImplTest.java
@@ -24,7 +24,6 @@
import io.r2dbc.spi.Connection;
import io.r2dbc.spi.R2dbcException;
import io.r2dbc.spi.Result;
-import io.r2dbc.spi.Row;
import io.r2dbc.spi.Statement;
import org.junit.jupiter.api.Test;
import org.reactivestreams.Publisher;
@@ -34,7 +33,6 @@
import java.math.BigDecimal;
import java.sql.RowId;
import java.util.Collections;
-import java.util.List;
import static java.util.Arrays.asList;
import static oracle.r2dbc.DatabaseConfig.connectTimeout;
@@ -42,7 +40,6 @@
import static oracle.r2dbc.DatabaseConfig.sharedConnection;
import static oracle.r2dbc.util.Awaits.awaitError;
import static oracle.r2dbc.util.Awaits.awaitExecution;
-import static oracle.r2dbc.util.Awaits.awaitMany;
import static oracle.r2dbc.util.Awaits.awaitNone;
import static oracle.r2dbc.util.Awaits.awaitOne;
import static oracle.r2dbc.util.Awaits.awaitQuery;
@@ -62,7 +59,7 @@ public class OracleStatementImplTest {
* {@link OracleStatementImpl#bind(int, Object)}
*/
@Test
- void testBindByIndex() {
+ public void testBindByIndex() {
Connection connection =
Mono.from(sharedConnection()).block(connectTimeout());
try {
@@ -184,7 +181,7 @@ class UnsupportedType {
* {@link OracleStatementImpl#bind(String, Object)}
*/
@Test
- void testBindByName() {
+ public void testBindByName() {
Connection connection =
Mono.from(sharedConnection()).block(connectTimeout());
try {
@@ -326,7 +323,7 @@ class UnsupportedType {
* {@link OracleStatementImpl#bindNull(int, Class)}
*/
@Test
- void testBindNullByIndex() {
+ public void testBindNullByIndex() {
Connection connection =
Mono.from(sharedConnection()).block(connectTimeout());
try {
@@ -464,7 +461,7 @@ void testBindNullByIndex() {
* {@link OracleStatementImpl#bindNull(String, Class)}
*/
@Test
- void testBindNullByName() {
+ public void testBindNullByName() {
Connection connection =
Mono.from(sharedConnection()).block(connectTimeout());
try {
@@ -633,7 +630,7 @@ void testBindNullByName() {
* {@link OracleStatementImpl#add()}
*/
@Test
- void testAdd() {
+ public void testAdd() {
Connection connection =
Mono.from(sharedConnection()).block(connectTimeout());
try {
@@ -744,7 +741,7 @@ void testAdd() {
* {@link OracleStatementImpl#execute()}
*/
@Test
- void testExecute() {
+ public void testExecute() {
Connection connection =
Mono.from(sharedConnection()).block(connectTimeout());
try {
@@ -849,7 +846,7 @@ void testExecute() {
* {@link OracleStatementImpl#returnGeneratedValues(String...)}
*/
@Test
- void testReturnGeneratedValues() {
+ public void testReturnGeneratedValues() {
Connection connection =
Mono.from(sharedConnection()).block(connectTimeout());
try {
@@ -995,7 +992,7 @@ void testReturnGeneratedValues() {
* {@link OracleStatementImpl#fetchSize(int)
*/
@Test
- void testFetchSize() {
+ public void testFetchSize() {
Connection connection =
Mono.from(sharedConnection()).block(connectTimeout());
try {
diff --git a/src/test/java/oracle/r2dbc/util/DatabaseConfigExtension.java b/src/test/java/oracle/r2dbc/util/DatabaseConfigExtension.java
deleted file mode 100755
index 5c0c75d..0000000
--- a/src/test/java/oracle/r2dbc/util/DatabaseConfigExtension.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- Copyright (c) 2020, 2021, Oracle and/or its affiliates.
-
- This software is dual-licensed to you under the Universal Permissive License
- (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License
- 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- either license.
-
- 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 oracle.r2dbc.util;
-
-import oracle.jdbc.pool.OracleDataSource;
-import oracle.r2dbc.DatabaseConfig;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.springframework.jdbc.core.JdbcOperations;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.SQLException;
-import java.util.Properties;
-
-/**
- * JUnit Extension to establish an Oracle Database connection configuration
- * during integration tests.
- *
- * @author harayuanwang
- * @since 0.1.0
- */
-public final class DatabaseConfigExtension implements BeforeAllCallback {
- private JdbcOperations jdbcOperations;
- private OracleDataSource dataSource;
-
- @Override
- public void beforeAll(ExtensionContext extensionContext)
- throws IOException, SQLException {
- initialize();
- }
-
- private void initialize() throws IOException, SQLException {
- dataSource = new OracleDataSource();
- dataSource.setURL(String.format("jdbc:oracle:thin:@%s:%d/%s",
- DatabaseConfig.host(), DatabaseConfig.port(),
- DatabaseConfig.serviceName()));
- dataSource.setUser(DatabaseConfig.user());
- dataSource.setPassword(DatabaseConfig.password());
- this.jdbcOperations = new JdbcTemplate(dataSource);
- }
-
- public JdbcOperations getJDBCOperations() {
- return this.jdbcOperations;
- }
-
- public String getUsername() {
- return DatabaseConfig.user();
- }
-
- public String getPassword() {
- return DatabaseConfig.password();
- }
-
- public String getServiceName() {
- return DatabaseConfig.serviceName();
- }
-
- public String getHost() {
- return DatabaseConfig.host();
- }
-
- public int getPort() {
- return DatabaseConfig.port();
- }
-}
-
-/*
- MODIFIED (MM/DD/YY)
- harayuanwang 05/12/20 - Creation
- */
diff --git a/src/test/java/oracle/r2dbc/util/OracleTestKitSupport.java b/src/test/java/oracle/r2dbc/util/OracleTestKitSupport.java
deleted file mode 100755
index a9d58fb..0000000
--- a/src/test/java/oracle/r2dbc/util/OracleTestKitSupport.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- Copyright (c) 2020, 2021, Oracle and/or its affiliates.
-
- This software is dual-licensed to you under the Universal Permissive License
- (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License
- 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
- either license.
-
- 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 oracle.r2dbc.util;
-
-import io.r2dbc.spi.ConnectionFactories;
-import io.r2dbc.spi.ConnectionFactory;
-import io.r2dbc.spi.ConnectionFactoryOptions;
-import oracle.r2dbc.impl.OracleConnectionFactoryProviderImpl;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import static io.r2dbc.spi.ConnectionFactoryOptions.*;
-
-/**
- * Initializes a {@link ConnectionFactory} with options specified
- * by {@link DatabaseConfigExtension}.
- *
- * @author harayuanwang
- * @since 0.1.0
- */
-public abstract class OracleTestKitSupport {
- @RegisterExtension
- protected static final DatabaseConfigExtension CONFIG =
- new DatabaseConfigExtension();
-
- protected static ConnectionFactory connectionFactory;
-
- @BeforeAll
- static void beforeAll() {
- ConnectionFactoryOptions options = builder().build();
- connectionFactory = ConnectionFactories.get(options);
- }
-
- static ConnectionFactoryOptions.Builder builder() {
- return ConnectionFactoryOptions.builder()
- .option(DRIVER, new OracleConnectionFactoryProviderImpl().getDriver())
- .option(DATABASE, CONFIG.getServiceName())
- .option(HOST, CONFIG.getHost())
- .option(PORT, CONFIG.getPort())
- .option(PASSWORD, CONFIG.getPassword())
- .option(USER, CONFIG.getUsername());
- }
-}
-
-/*
- MODIFIED (MM/DD/YY)
- harayuanwang 05/12/20 - Creation
- */