diff --git a/jpa/jpa21/src/main/resources/application.properties b/jpa/jpa21/src/main/resources/application.properties index d98d035f..e845ada3 100644 --- a/jpa/jpa21/src/main/resources/application.properties +++ b/jpa/jpa21/src/main/resources/application.properties @@ -1 +1 @@ -spring.datasource.separator=/; \ No newline at end of file +spring.sql.init.separator=/; diff --git a/mongodb/fluent-api/src/test/java/example/springdata/mongodb/fluent/FluentMongoApiTests.java b/mongodb/fluent-api/src/test/java/example/springdata/mongodb/fluent/FluentMongoApiTests.java index 2d835fbd..7a8faa7c 100644 --- a/mongodb/fluent-api/src/test/java/example/springdata/mongodb/fluent/FluentMongoApiTests.java +++ b/mongodb/fluent-api/src/test/java/example/springdata/mongodb/fluent/FluentMongoApiTests.java @@ -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(); diff --git a/mongodb/util/src/main/java/example/springdata/mongodb/util/EmbeddedMongo.java b/mongodb/util/src/main/java/example/springdata/mongodb/util/EmbeddedMongo.java index d3019414..2d94ebdd 100644 --- a/mongodb/util/src/main/java/example/springdata/mongodb/util/EmbeddedMongo.java +++ b/mongodb/util/src/main/java/example/springdata/mongodb/util/EmbeddedMongo.java @@ -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())); } } diff --git a/mongodb/util/src/main/java/example/springdata/mongodb/util/MongosSystemForTestFactory.java b/mongodb/util/src/main/java/example/springdata/mongodb/util/MongosSystemForTestFactory.java index f015559c..c5e9a170 100644 --- a/mongodb/util/src/main/java/example/springdata/mongodb/util/MongosSystemForTestFactory.java +++ b/mongodb/util/src/main/java/example/springdata/mongodb/util/MongosSystemForTestFactory.java @@ -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 { diff --git a/pom.xml b/pom.xml index ebb86e37..1e3697ca 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.0-M3 + 2.7.0-RC1 @@ -38,9 +38,7 @@ 16 16 - 1.11.14 - 1.16.0 - 1.5.0 + 1.17.0 1.1.3 UTF-8