Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#111 - Package and type renames.

Browse Source 
Package renames:

- `….domain` -> `….mapping`
- `….function.connectionfactory` -> `connectionfactory`
- `….function.convert` -> `convert`
- `….function.query` -> `query`
- `….function` -> `….core`

Type moves:

- `….dialect.R2dbcSimpleTypeHolder` -> `….mapping.R2dbcSimpleTypeHolder`
- `….mapping.BindTarget` -> `….dialect.BindTarget`
- `….mapping.PreparedOperation` -> `….core.PreparedOperation`
- `….mapping.QueryOperation` -> `….core.QueryOperation`
- `….mapping.BindOperation` -> `….core.BindOperation`
- `….connectionfactory.ConnectionFactoryTransactionManager` -> `….connectionfactory.R2dbcTransactionManager`

That makes us end up with:

- `connectionfactory`
- `core` -> `connectionfactory`, `convert`, `dialect`, `mapping`, `query`
- `query` -> `convert`, `dialect`, `mapping`
- `convert` -> `dialect`, `mapping`
- `dialect` -> `mapping`
- `mapping` -> Spring Data Commons mapping

Reflect type renames in reference documentation.
This commit is contained in:
Oliver Drotbohm
2019-05-09 18:11:55 +02:00
parent 988b31b33a
commit c456af0d2a
124 changed files with 388 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/springframework/data/r2dbc/config/R2dbcConfigurationIntegrationTests.java
View File

@@ -27,7 +27,7 @@ import org.junit.Test;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.r2dbc.function.DatabaseClient;
import org.springframework.data.r2dbc.core.DatabaseClient;
/**
* Tests for {@link AbstractR2dbcConfiguration}.

5
src/test/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryUtilsUnitTests.java → src/test/java/org/springframework/data/r2dbc/connectionfactory/ConnectionFactoryUtilsUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function.connectionfactory;
package org.springframework.data.r2dbc.connectionfactory;
import static org.mockito.Mockito.*;
@@ -22,6 +22,9 @@ import io.r2dbc.spi.ConnectionFactory;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.reactivestreams.Publisher;
import org.springframework.data.r2dbc.connectionfactory.ConnectionFactoryUtils;
import org.springframework.data.r2dbc.connectionfactory.ReactiveTransactionSynchronization;
import org.springframework.data.r2dbc.connectionfactory.TransactionResources;
import org.springframework.transaction.NoTransactionException;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;

3
src/test/java/org/springframework/data/r2dbc/function/connectionfactory/DelegatingConnectionFactoryUnitTests.java → src/test/java/org/springframework/data/r2dbc/connectionfactory/DelegatingConnectionFactoryUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function.connectionfactory;
package org.springframework.data.r2dbc.connectionfactory;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -23,6 +23,7 @@ import io.r2dbc.spi.ConnectionFactory;
import reactor.core.publisher.Mono;
import org.junit.Test;
import org.springframework.data.r2dbc.connectionfactory.DelegatingConnectionFactory;
/**
* Unit tests for {@link DelegatingConnectionFactory}.

13
src/test/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryTransactionManagerUnitTests.java → src/test/java/org/springframework/data/r2dbc/connectionfactory/R2dbcTransactionManagerUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function.connectionfactory;
package org.springframework.data.r2dbc.connectionfactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.*;
@@ -32,7 +32,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.r2dbc.connectionfactory.R2dbcTransactionManager;
import org.springframework.data.r2dbc.connectionfactory.ConnectionFactoryUtils;
import org.springframework.transaction.IllegalTransactionStateException;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.reactive.TransactionSynchronization;
@@ -41,16 +42,16 @@ import org.springframework.transaction.reactive.TransactionalOperator;
import org.springframework.transaction.support.DefaultTransactionDefinition;
/**
* Unit tests for {@link ConnectionFactoryTransactionManager}.
* Unit tests for {@link R2dbcTransactionManager}.
*
* @author Mark Paluch
*/
public class ConnectionFactoryTransactionManagerUnitTests {
public class R2dbcTransactionManagerUnitTests {
ConnectionFactory connectionFactoryMock = mock(ConnectionFactory.class);
Connection connectionMock = mock(Connection.class);
private ConnectionFactoryTransactionManager tm;
private R2dbcTransactionManager tm;
@Before
public void before() {
@@ -58,7 +59,7 @@ public class ConnectionFactoryTransactionManagerUnitTests {
when(connectionFactoryMock.create()).thenReturn((Mono) Mono.just(connectionMock));
when(connectionMock.beginTransaction()).thenReturn(Mono.empty());
when(connectionMock.close()).thenReturn(Mono.empty());
tm = new ConnectionFactoryTransactionManager(connectionFactoryMock);
tm = new R2dbcTransactionManager(connectionFactoryMock);
}
@Test // gh-107

10
src/test/java/org/springframework/data/r2dbc/function/connectionfactory/TransactionAwareConnectionFactoryProxyUnitTests.java → src/test/java/org/springframework/data/r2dbc/connectionfactory/TransactionAwareConnectionFactoryProxyUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function.connectionfactory;
package org.springframework.data.r2dbc.connectionfactory;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -24,6 +24,10 @@ import io.r2dbc.spi.Connection;
import io.r2dbc.spi.ConnectionFactory;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.r2dbc.connectionfactory.R2dbcTransactionManager;
import org.springframework.data.r2dbc.connectionfactory.ConnectionFactoryUtils;
import org.springframework.data.r2dbc.connectionfactory.ConnectionProxy;
import org.springframework.data.r2dbc.connectionfactory.TransactionAwareConnectionFactoryProxy;
import org.springframework.transaction.reactive.TransactionalOperator;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
@@ -42,14 +46,14 @@ public class TransactionAwareConnectionFactoryProxyUnitTests {
Connection connectionMock2 = mock(Connection.class);
Connection connectionMock3 = mock(Connection.class);
private ConnectionFactoryTransactionManager tm;
private R2dbcTransactionManager tm;
@Before
public void before() {
when(connectionFactoryMock.create()).thenReturn((Mono) Mono.just(connectionMock1),
(Mono) Mono.just(connectionMock2), (Mono) Mono.just(connectionMock3));
tm = new ConnectionFactoryTransactionManager(connectionFactoryMock);
tm = new R2dbcTransactionManager(connectionFactoryMock);
}
@Test // gh-107

6
src/test/java/org/springframework/data/r2dbc/function/convert/EntityRowMapperUnitTests.java → src/test/java/org/springframework/data/r2dbc/convert/EntityRowMapperUnitTests.java
View File

@@ -1,4 +1,4 @@
package org.springframework.data.r2dbc.function.convert;
package org.springframework.data.r2dbc.convert;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -13,9 +13,9 @@ import java.util.Set;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.r2dbc.convert.EntityRowMapper;
import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.dialect.PostgresDialect;
import org.springframework.data.r2dbc.function.DefaultReactiveDataAccessStrategy;
/**
* Unit tests for {@link EntityRowMapper}.

8
src/test/java/org/springframework/data/r2dbc/function/convert/MappingR2dbcConverterUnitTests.java → src/test/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverterUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function.convert;
package org.springframework.data.r2dbc.convert;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -33,8 +33,10 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.annotation.Id;
import org.springframework.data.convert.ReadingConverter;
import org.springframework.data.convert.WritingConverter;
import org.springframework.data.r2dbc.domain.OutboundRow;
import org.springframework.data.r2dbc.domain.SettableValue;
import org.springframework.data.r2dbc.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.convert.R2dbcCustomConversions;
import org.springframework.data.r2dbc.mapping.OutboundRow;
import org.springframework.data.r2dbc.mapping.SettableValue;
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
/**

21
src/test/java/org/springframework/data/r2dbc/function/convert/R2dbcConvertersUnitTests.java → src/test/java/org/springframework/data/r2dbc/convert/R2dbcConvertersUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function.convert;
package org.springframework.data.r2dbc.convert;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -30,15 +30,16 @@ import java.util.UUID;
import org.junit.Test;
import org.springframework.core.convert.converter.Converter;
import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToBooleanConverter;
import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToLocalDateConverter;
import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToLocalDateTimeConverter;
import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToLocalTimeConverter;
import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory;
import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToOffsetDateTimeConverter;
import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToStringConverter;
import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToUuidConverter;
import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToZonedDateTimeConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverters;
import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToBooleanConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToLocalDateConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToLocalDateTimeConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToLocalTimeConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory;
import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToOffsetDateTimeConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToStringConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToUuidConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToZonedDateTimeConverter;
/**
* Unit tests for {@link R2dbcConverters}.

9
src/test/java/org/springframework/data/r2dbc/function/AbstractDatabaseClientIntegrationTests.java → src/test/java/org/springframework/data/r2dbc/core/AbstractDatabaseClientIntegrationTests.java
View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.domain.Sort.Order.*;
import static org.springframework.data.r2dbc.function.query.Criteria.*;
import static org.springframework.data.r2dbc.query.Criteria.*;
import io.r2dbc.spi.ConnectionFactory;
import lombok.Data;
@@ -33,8 +33,9 @@ import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.data.annotation.Id;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.data.r2dbc.function.query.Criteria;
import org.springframework.data.r2dbc.function.query.Update;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.query.Criteria;
import org.springframework.data.r2dbc.query.Update;
import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport;
import org.springframework.data.relational.core.mapping.Table;
import org.springframework.jdbc.core.JdbcTemplate;

12
src/test/java/org/springframework/data/r2dbc/function/AbstractTransactionalDatabaseClientIntegrationTests.java → src/test/java/org/springframework/data/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import static org.assertj.core.api.Assertions.*;
@@ -34,7 +34,9 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.dao.DataAccessException;
import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration;
import org.springframework.data.r2dbc.function.connectionfactory.ConnectionFactoryTransactionManager;
import org.springframework.data.r2dbc.connectionfactory.R2dbcTransactionManager;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.core.TransactionalDatabaseClient;
import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.transaction.NoTransactionException;
@@ -244,7 +246,7 @@ public abstract class AbstractTransactionalDatabaseClientIntegrationTests extend
DatabaseClient databaseClient = DatabaseClient.create(connectionFactory);
TransactionalOperator transactionalOperator = TransactionalOperator
.create(new ConnectionFactoryTransactionManager(connectionFactory), new DefaultTransactionDefinition());
.create(new R2dbcTransactionManager(connectionFactory), new DefaultTransactionDefinition());
Flux<Object> txId = databaseClient.execute() //
.sql(getCurrentTransactionIdStatement()) //
@@ -269,7 +271,7 @@ public abstract class AbstractTransactionalDatabaseClientIntegrationTests extend
DatabaseClient databaseClient = DatabaseClient.create(connectionFactory);
TransactionalOperator transactionalOperator = TransactionalOperator
.create(new ConnectionFactoryTransactionManager(connectionFactory), new DefaultTransactionDefinition());
.create(new R2dbcTransactionManager(connectionFactory), new DefaultTransactionDefinition());
Flux<Integer> integerFlux = databaseClient.execute() //
.sql(getInsertIntoLegosetStatement()) //
@@ -331,7 +333,7 @@ public abstract class AbstractTransactionalDatabaseClientIntegrationTests extend
@Bean
ReactiveTransactionManager txMgr(ConnectionFactory connectionFactory) {
return new ConnectionFactoryTransactionManager(connectionFactory);
return new R2dbcTransactionManager(connectionFactory);
}
}

6
src/test/java/org/springframework/data/r2dbc/function/DefaultDatabaseClientUnitTests.java → src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import static org.mockito.Mockito.*;
@@ -30,7 +30,9 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscription;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.core.DefaultDatabaseClient;
import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.support.R2dbcExceptionTranslator;
/**

4
src/test/java/org/springframework/data/r2dbc/function/H2DatabaseClientIntegrationTests.java → src/test/java/org/springframework/data/r2dbc/core/H2DatabaseClientIntegrationTests.java
View File

@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import io.r2dbc.spi.ConnectionFactory;
import javax.sql.DataSource;
import org.junit.Ignore;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.testing.H2TestSupport;
/**

4
src/test/java/org/springframework/data/r2dbc/function/MySqlDatabaseClientIntegrationTests.java → src/test/java/org/springframework/data/r2dbc/core/MySqlDatabaseClientIntegrationTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import io.r2dbc.spi.ConnectionFactory;
@@ -22,7 +22,7 @@ import javax.sql.DataSource;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.testing.ExternalDatabase;
import org.springframework.data.r2dbc.testing.MySqlTestSupport;

4
src/test/java/org/springframework/data/r2dbc/function/MySqlTransactionalDatabaseClientIntegrationTests.java → src/test/java/org/springframework/data/r2dbc/core/MySqlTransactionalDatabaseClientIntegrationTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import javax.sql.DataSource;
import java.time.Duration;
@@ -22,6 +22,8 @@ import io.r2dbc.spi.ConnectionFactory;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.core.TransactionalDatabaseClient;
import org.springframework.data.r2dbc.testing.ExternalDatabase;
import org.springframework.data.r2dbc.testing.MySqlTestSupport;
import reactor.core.publisher.Mono;

10
src/test/java/org/springframework/data/r2dbc/function/NamedParameterUtilsUnitTests.java → src/test/java/org/springframework/data/r2dbc/core/NamedParameterUtilsUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -22,12 +22,14 @@ import java.util.Arrays;
import java.util.HashMap;
import org.junit.Test;
import org.springframework.data.r2dbc.core.BindableOperation;
import org.springframework.data.r2dbc.core.MapBindParameterSource;
import org.springframework.data.r2dbc.core.NamedParameterUtils;
import org.springframework.data.r2dbc.core.ParsedSql;
import org.springframework.data.r2dbc.dialect.BindMarkersFactory;
import org.springframework.data.r2dbc.dialect.BindTarget;
import org.springframework.data.r2dbc.dialect.PostgresDialect;
import org.springframework.data.r2dbc.dialect.SqlServerDialect;
import org.springframework.data.r2dbc.domain.BindTarget;
import org.springframework.data.r2dbc.domain.BindableOperation;
/**
* Unit tests for {@link NamedParameterUtils}.

3
src/test/java/org/springframework/data/r2dbc/function/PostgresDatabaseClientIntegrationTests.java → src/test/java/org/springframework/data/r2dbc/core/PostgresDatabaseClientIntegrationTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import io.r2dbc.spi.ConnectionFactory;
@@ -22,6 +22,7 @@ import javax.sql.DataSource;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.testing.ExternalDatabase;
import org.springframework.data.r2dbc.testing.PostgresTestSupport;

3
src/test/java/org/springframework/data/r2dbc/function/PostgresIntegrationTests.java → src/test/java/org/springframework/data/r2dbc/core/PostgresIntegrationTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import static org.assertj.core.api.Assertions.*;
@@ -31,6 +31,7 @@ import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.testing.ExternalDatabase;
import org.springframework.data.r2dbc.testing.PostgresTestSupport;
import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport;

4
src/test/java/org/springframework/data/r2dbc/function/PostgresReactiveDataAccessStrategyTests.java → src/test/java/org/springframework/data/r2dbc/core/PostgresReactiveDataAccessStrategyTests.java
View File

@@ -13,8 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.dialect.PostgresDialect;
/**

3
src/test/java/org/springframework/data/r2dbc/function/PostgresTransactionalDatabaseClientIntegrationTests.java → src/test/java/org/springframework/data/r2dbc/core/PostgresTransactionalDatabaseClientIntegrationTests.java
View File

@@ -1,10 +1,11 @@
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import io.r2dbc.spi.ConnectionFactory;
import javax.sql.DataSource;
import org.junit.ClassRule;
import org.springframework.data.r2dbc.core.TransactionalDatabaseClient;
import org.springframework.data.r2dbc.testing.ExternalDatabase;
import org.springframework.data.r2dbc.testing.PostgresTestSupport;

7
src/test/java/org/springframework/data/r2dbc/function/ReactiveDataAccessStrategyTestSupport.java → src/test/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategyTestSupport.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -34,9 +34,10 @@ import java.util.function.BiConsumer;
import java.util.function.Function;
import org.junit.Test;
import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.dialect.Dialect;
import org.springframework.data.r2dbc.domain.SettableValue;
import org.springframework.data.r2dbc.mapping.SettableValue;
/**
* Abstract base class for {@link Dialect}-aware {@link DefaultReactiveDataAccessStrategy} tests.

3
src/test/java/org/springframework/data/r2dbc/function/SqlServerDatabaseClientIntegrationTests.java → src/test/java/org/springframework/data/r2dbc/core/SqlServerDatabaseClientIntegrationTests.java
View File

@@ -13,13 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import io.r2dbc.spi.ConnectionFactory;
import javax.sql.DataSource;
import org.junit.ClassRule;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.testing.ExternalDatabase;
import org.springframework.data.r2dbc.testing.SqlServerTestSupport;

4
src/test/java/org/springframework/data/r2dbc/function/SqlServerReactiveDataAccessStrategyTests.java → src/test/java/org/springframework/data/r2dbc/core/SqlServerReactiveDataAccessStrategyTests.java
View File

@@ -13,8 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.dialect.SqlServerDialect;
/**

3
src/test/java/org/springframework/data/r2dbc/function/SqlServerTransactionalDatabaseClientIntegrationTests.java → src/test/java/org/springframework/data/r2dbc/core/SqlServerTransactionalDatabaseClientIntegrationTests.java
View File

@@ -1,10 +1,11 @@
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import io.r2dbc.spi.ConnectionFactory;
import javax.sql.DataSource;
import org.junit.ClassRule;
import org.springframework.data.r2dbc.core.TransactionalDatabaseClient;
import org.springframework.data.r2dbc.testing.ExternalDatabase;
import org.springframework.data.r2dbc.testing.SqlServerTestSupport;

17
src/test/java/org/springframework/data/r2dbc/function/StatementMapperUnitTests.java → src/test/java/org/springframework/data/r2dbc/core/StatementMapperUnitTests.java
View File

@@ -13,19 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function;
package org.springframework.data.r2dbc.core;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import org.junit.Test;
import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.core.DefaultStatementMapper;
import org.springframework.data.r2dbc.core.PreparedOperation;
import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.core.StatementMapper;
import org.springframework.data.r2dbc.core.StatementMapper.UpdateSpec;
import org.springframework.data.r2dbc.dialect.BindTarget;
import org.springframework.data.r2dbc.dialect.PostgresDialect;
import org.springframework.data.r2dbc.domain.BindTarget;
import org.springframework.data.r2dbc.domain.PreparedOperation;
import org.springframework.data.r2dbc.function.StatementMapper.UpdateSpec;
import org.springframework.data.r2dbc.function.query.Criteria;
import org.springframework.data.r2dbc.function.query.Update;
import org.springframework.data.r2dbc.query.Criteria;
import org.springframework.data.r2dbc.query.Update;
/**
* Unit tests for {@link DefaultStatementMapper}.

2
src/test/java/org/springframework/data/r2dbc/dialect/AnonymousBindMarkersUnitTests.java
View File

@@ -20,8 +20,6 @@ import static org.mockito.Mockito.*;
import org.junit.Test;
import org.springframework.data.r2dbc.domain.BindTarget;
/**
* Unit tests for {@link AnonymousBindMarkers}.
*

2
src/test/java/org/springframework/data/r2dbc/dialect/BindingsUnitTests.java
View File

@@ -24,8 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.springframework.data.r2dbc.domain.BindTarget;
/**
* Unit tests for {@link Bindings}.
*

2
src/test/java/org/springframework/data/r2dbc/dialect/IndexedBindMarkersUnitTests.java
View File

@@ -5,8 +5,6 @@ import static org.mockito.Mockito.*;
import org.junit.Test;
import org.springframework.data.r2dbc.domain.BindTarget;
/**
* Unit tests for {@link IndexedBindMarkers}.
*

2
src/test/java/org/springframework/data/r2dbc/dialect/NamedBindMarkersUnitTests.java
View File

@@ -5,8 +5,6 @@ import static org.mockito.Mockito.*;
import org.junit.Test;
import org.springframework.data.r2dbc.domain.BindTarget;
/**
* Unit tests for {@link NamedBindMarkers}.
*

3
src/test/java/org/springframework/data/r2dbc/domain/SettableValueUnitTests.java → src/test/java/org/springframework/data/r2dbc/mapping/SettableValueUnitTests.java
View File

@@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.domain;
package org.springframework.data.r2dbc.mapping;
import static org.assertj.core.api.Assertions.*;
import org.junit.Test;
import org.springframework.data.r2dbc.mapping.SettableValue;
/**
* Unit tests for {@link SettableValue}.

9
src/test/java/org/springframework/data/r2dbc/function/query/CriteriaUnitTests.java → src/test/java/org/springframework/data/r2dbc/query/CriteriaUnitTests.java
View File

@@ -13,16 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function.query;
package org.springframework.data.r2dbc.query;
import static org.assertj.core.api.Assertions.*;
import static org.springframework.data.r2dbc.function.query.Criteria.*;
import static org.springframework.data.r2dbc.query.Criteria.*;
import java.util.Arrays;
import org.junit.Test;
import org.springframework.data.r2dbc.function.query.Criteria.Combinator;
import org.springframework.data.r2dbc.function.query.Criteria.Comparator;
import org.springframework.data.r2dbc.query.Criteria;
import org.springframework.data.r2dbc.query.Criteria.Combinator;
import org.springframework.data.r2dbc.query.Criteria.Comparator;
/**
* Unit tests for {@link Criteria}.

13
src/test/java/org/springframework/data/r2dbc/function/query/QueryMapperUnitTests.java → src/test/java/org/springframework/data/r2dbc/query/QueryMapperUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function.query;
package org.springframework.data.r2dbc.query;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -21,11 +21,14 @@ import static org.springframework.data.domain.Sort.Order.*;
import org.junit.Test;
import org.springframework.data.domain.Sort;
import org.springframework.data.r2dbc.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverter;
import org.springframework.data.r2dbc.dialect.BindMarkersFactory;
import org.springframework.data.r2dbc.domain.BindTarget;
import org.springframework.data.r2dbc.domain.SettableValue;
import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.function.convert.R2dbcConverter;
import org.springframework.data.r2dbc.dialect.BindTarget;
import org.springframework.data.r2dbc.mapping.SettableValue;
import org.springframework.data.r2dbc.query.BoundCondition;
import org.springframework.data.r2dbc.query.Criteria;
import org.springframework.data.r2dbc.query.QueryMapper;
import org.springframework.data.relational.core.mapping.Column;
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
import org.springframework.data.relational.core.sql.Table;

13
src/test/java/org/springframework/data/r2dbc/function/query/UpdateMapperUnitTests.java → src/test/java/org/springframework/data/r2dbc/query/UpdateMapperUnitTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function.query;
package org.springframework.data.r2dbc.query;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -22,11 +22,14 @@ import java.util.Map;
import java.util.stream.Collectors;
import org.junit.Test;
import org.springframework.data.r2dbc.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverter;
import org.springframework.data.r2dbc.dialect.BindMarkersFactory;
import org.springframework.data.r2dbc.domain.BindTarget;
import org.springframework.data.r2dbc.domain.SettableValue;
import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.function.convert.R2dbcConverter;
import org.springframework.data.r2dbc.dialect.BindTarget;
import org.springframework.data.r2dbc.mapping.SettableValue;
import org.springframework.data.r2dbc.query.BoundAssignments;
import org.springframework.data.r2dbc.query.Update;
import org.springframework.data.r2dbc.query.UpdateMapper;
import org.springframework.data.relational.core.mapping.Column;
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
import org.springframework.data.relational.core.sql.AssignValue;

6
src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java
View File

@@ -37,10 +37,10 @@ import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.data.annotation.Id;
import org.springframework.data.r2dbc.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.core.TransactionalDatabaseClient;
import org.springframework.data.r2dbc.dialect.Database;
import org.springframework.data.r2dbc.function.DefaultReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.function.TransactionalDatabaseClient;
import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory;
import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport;
import org.springframework.data.relational.core.mapping.RelationalMappingContext;

6
src/test/java/org/springframework/data/r2dbc/repository/config/R2dbcRepositoriesRegistrarTests.java
View File

@@ -24,10 +24,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.dialect.PostgresDialect;
import org.springframework.data.r2dbc.function.DatabaseClient;
import org.springframework.data.r2dbc.function.DefaultReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;

6
src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java
View File

@@ -29,9 +29,9 @@ import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.projection.ProjectionFactory;
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
import org.springframework.data.r2dbc.function.DatabaseClient;
import org.springframework.data.r2dbc.function.DatabaseClient.GenericExecuteSpec;
import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.core.DatabaseClient.GenericExecuteSpec;
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
import org.springframework.data.repository.Repository;
import org.springframework.data.repository.core.RepositoryMetadata;

6
src/test/java/org/springframework/data/r2dbc/repository/support/AbstractSimpleR2dbcRepositoryIntegrationTests.java
View File

@@ -38,9 +38,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.data.annotation.Id;
import org.springframework.data.domain.Persistable;
import org.springframework.data.r2dbc.function.DatabaseClient;
import org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.convert.MappingR2dbcConverter;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport;
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;

6
src/test/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryUnitTests.java
View File

@@ -25,9 +25,9 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.r2dbc.function.DatabaseClient;
import org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.function.convert.R2dbcConverter;
import org.springframework.data.r2dbc.convert.R2dbcConverter;
import org.springframework.data.r2dbc.core.DatabaseClient;
import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
import org.springframework.data.relational.repository.query.RelationalEntityInformation;
import org.springframework.data.relational.repository.support.MappingRelationalEntityInformation;

2
src/test/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensionsTests.kt → src/test/kotlin/org/springframework/data/r2dbc/core/DatabaseClientExtensionsTests.kt
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function
package org.springframework.data.r2dbc.core
import io.mockk.every
import io.mockk.mockk

2
src/test/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensionsTests.kt → src/test/kotlin/org/springframework/data/r2dbc/core/RowsFetchSpecExtensionsTests.kt
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.r2dbc.function
package org.springframework.data.r2dbc.core
import io.mockk.every
import io.mockk.mockk