From 740522ea07f6c1bacc61f13e927aedcbf4e8c40d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 14 Aug 2020 12:00:20 +0200 Subject: [PATCH] #582 - Adopt to changes in Spring Data R2DBC 1.2. --- .../r2dbc/basics/CustomerRepositoryIntegrationTests.java | 8 ++++---- .../basics/TransactionalServiceIntegrationTests.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/r2dbc/example/src/test/java/example/springdata/r2dbc/basics/CustomerRepositoryIntegrationTests.java b/r2dbc/example/src/test/java/example/springdata/r2dbc/basics/CustomerRepositoryIntegrationTests.java index fa995cd1..b3642fa4 100644 --- a/r2dbc/example/src/test/java/example/springdata/r2dbc/basics/CustomerRepositoryIntegrationTests.java +++ b/r2dbc/example/src/test/java/example/springdata/r2dbc/basics/CustomerRepositoryIntegrationTests.java @@ -1,11 +1,11 @@ /* - * Copyright 2018 the original author or authors. + * Copyright 2020 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 + * http://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, @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.r2dbc.core.DatabaseClient; import org.springframework.test.context.junit4.SpringRunner; /** @@ -49,7 +49,7 @@ public class CustomerRepositoryIntegrationTests { "DROP TABLE IF EXISTS customer;", "CREATE TABLE customer ( id SERIAL PRIMARY KEY, firstname VARCHAR(100) NOT NULL, lastname VARCHAR(100) NOT NULL);"); - statements.forEach(it -> database.execute(it) // + statements.forEach(it -> database.sql(it) // .fetch() // .rowsUpdated() // .as(StepVerifier::create) // diff --git a/r2dbc/example/src/test/java/example/springdata/r2dbc/basics/TransactionalServiceIntegrationTests.java b/r2dbc/example/src/test/java/example/springdata/r2dbc/basics/TransactionalServiceIntegrationTests.java index ec9645bc..dbc37715 100644 --- a/r2dbc/example/src/test/java/example/springdata/r2dbc/basics/TransactionalServiceIntegrationTests.java +++ b/r2dbc/example/src/test/java/example/springdata/r2dbc/basics/TransactionalServiceIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2020 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. @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.r2dbc.core.DatabaseClient; import org.springframework.test.context.junit4.SpringRunner; /** @@ -52,7 +52,7 @@ public class TransactionalServiceIntegrationTests { "DROP TABLE IF EXISTS customer;", "CREATE TABLE customer ( id SERIAL PRIMARY KEY, firstname VARCHAR(100) NOT NULL, lastname VARCHAR(100) NOT NULL);"); - statements.forEach(it -> database.execute(it) // + statements.forEach(it -> database.sql(it) // .fetch() // .rowsUpdated() // .as(StepVerifier::create) //