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

Upgrade to Spring Boot 2.7 RC1.

Browse Source 
Remove unneeded version properties. Move off deprecated config properties. Adopt to flapdoodle deprecations.

See #636
This commit is contained in:
Mark Paluch
2022-04-26 08:54:45 +02:00
committed by Greg L. Turnquist
parent a73d74a76d
commit 2eae935af8
5 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jpa/jpa21/src/main/resources/application.properties
View File

@@ -1 +1 @@
spring.datasource.separator=/;
spring.sql.init.separator=/;

2
mongodb/fluent-api/src/test/java/example/springdata/mongodb/fluent/FluentMongoApiTests.java
View File

@@ -124,7 +124,7 @@ class FluentMongoApiTests {
@Test
void fetchInterfaceProjection() {
var anakin = mongoOps.query(SWCharacter.class) // SWCharacter does only define the collection, id and name
var anakin = mongoOps.query(Jedi.class) // SWCharacter does only define the collection, id and name
.as(Sith.class) // use an interface as return type to create a projection
.matching(query(where("firstname").is("anakin"))) // so properties are taken as is
.oneValue();

18
mongodb/util/src/main/java/example/springdata/mongodb/util/EmbeddedMongo.java
View File

@@ -16,19 +16,16 @@
package example.springdata.mongodb.util;
import de.flapdoodle.embed.mongo.Command;
import de.flapdoodle.embed.mongo.config.ImmutableMongodConfig;
import de.flapdoodle.embed.mongo.config.ImmutableMongosConfig;
import de.flapdoodle.embed.mongo.config.MongoCmdOptions;
import de.flapdoodle.embed.mongo.config.MongodConfig;
import de.flapdoodle.embed.mongo.config.MongosConfig;
import de.flapdoodle.embed.mongo.config.Net;
import de.flapdoodle.embed.mongo.config.Storage;
import de.flapdoodle.embed.mongo.distribution.Feature;
import de.flapdoodle.embed.mongo.distribution.IFeatureAwareVersion;
import de.flapdoodle.embed.mongo.distribution.Versions;
import de.flapdoodle.embed.process.config.io.ProcessOutput;
import de.flapdoodle.embed.mongo.packageresolver.Feature;
import de.flapdoodle.embed.process.config.process.ProcessOutput;
import de.flapdoodle.embed.process.distribution.Version;
import de.flapdoodle.embed.process.io.Processors;
import de.flapdoodle.embed.process.runtime.Network;
import java.io.IOException;
@@ -67,9 +64,9 @@ public class EmbeddedMongo extends ExternalResource {
private static final String STORAGE_ENGINE = "wiredTiger";
private static final IFeatureAwareVersion VERSION = Versions.withFeatures(Version.of("3.7.9"),
Feature.ONLY_WITH_SSL, Feature.ONLY_64BIT, Feature.NO_HTTP_INTERFACE_ARG, Feature.STORAGE_ENGINE,
Feature.MONGOS_CONFIGDB_SET_STYLE, Feature.NO_CHUNKSIZE_ARG);
private static final IFeatureAwareVersion VERSION = Versions.withFeatures(Version.of("3.7.9"), Feature.ONLY_64BIT,
Feature.NO_HTTP_INTERFACE_ARG, Feature.STORAGE_ENGINE, Feature.MONGOS_CONFIGDB_SET_STYLE,
Feature.NO_CHUNKSIZE_ARG);
private final TestResource resource;
@@ -269,10 +266,9 @@ public class EmbeddedMongo extends ExternalResource {
this.mongosPort = randomOrDefaultServerPort();
if (silent) {
outputFunction = it -> new ProcessOutput(Processors.silent(),
Processors.namedConsole("[ " + it.commandName() + " error]"), Processors.console());
outputFunction = it -> ProcessOutput.silent();
} else {
outputFunction = it -> ProcessOutput.getDefaultInstance(it.commandName());
outputFunction = it -> ProcessOutput.named(it.commandName(), LoggerFactory.getLogger(getClass()));
}
}

7
mongodb/util/src/main/java/example/springdata/mongodb/util/MongosSystemForTestFactory.java
View File

@@ -16,7 +16,6 @@
package example.springdata.mongodb.util;
import de.flapdoodle.embed.mongo.Command;
import de.flapdoodle.embed.mongo.MongodExecutable;
import de.flapdoodle.embed.mongo.MongodProcess;
import de.flapdoodle.embed.mongo.MongodStarter;
import de.flapdoodle.embed.mongo.MongosExecutable;
@@ -26,7 +25,7 @@ import de.flapdoodle.embed.mongo.config.MongodConfig;
import de.flapdoodle.embed.mongo.config.MongosConfig;
import de.flapdoodle.embed.mongo.config.Net;
import de.flapdoodle.embed.process.config.RuntimeConfig;
import de.flapdoodle.embed.process.config.io.ProcessOutput;
import de.flapdoodle.embed.process.config.process.ProcessOutput;
import lombok.SneakyThrows;
import java.util.ArrayList;
@@ -46,11 +45,7 @@ import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import com.mongodb.MongoClientSettings;
import com.mongodb.ServerAddress;
import com.mongodb.client.FindIterable;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.MongoDatabase;
class MongosSystemForTestFactory {

6
pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.0-M3</version>
<version>2.7.0-RC1</version>
</parent>
<modules>
@@ -38,9 +38,7 @@
<properties>
<maven.compiler.source>16</maven.compiler.source>
<maven.compiler.target>16</maven.compiler.target>
<byte-buddy.version>1.11.14</byte-buddy.version>
<testcontainers.version>1.16.0</testcontainers.version>
<kotlin.version>1.5.0</kotlin.version>
<testcontainers.version>1.17.0</testcontainers.version>
<apt.version>1.1.3</apt.version>
<jvm.enable-preview></jvm.enable-preview>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>