diff --git a/pom.xml b/pom.xml index 1c2f30e0..c86cb1c7 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 1.0.0 3.5.1 - 3.5.0 + 4.3.2 2022.2.2 UTF-8 UTF-8 diff --git a/spring-modulith-events/spring-modulith-events-mongodb/pom.xml b/spring-modulith-events/spring-modulith-events-mongodb/pom.xml index e54096f7..4c8ec128 100644 --- a/spring-modulith-events/spring-modulith-events-mongodb/pom.xml +++ b/spring-modulith-events/spring-modulith-events-mongodb/pom.xml @@ -42,7 +42,7 @@ de.flapdoodle.embed - de.flapdoodle.embed.mongo + de.flapdoodle.embed.mongo.spring30x ${flapdoodle-mongodb.version} test diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationAutoConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationAutoConfigurationIntegrationTests.java index ee9999ff..531d4ddb 100644 --- a/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationAutoConfigurationIntegrationTests.java +++ b/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationAutoConfigurationIntegrationTests.java @@ -30,7 +30,7 @@ import org.springframework.modulith.testapp.TestApplication; * @author Oliver Drotbohm */ @SpringBootTest(classes = TestApplication.class) -class MongoDbEventPublicationAutoConfigurationIntegrationTests extends WithEmbeddedMongoDb { +class MongoDbEventPublicationAutoConfigurationIntegrationTests { @Autowired ApplicationContext context; diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepositoryTest.java b/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepositoryTest.java index cab0b99c..7139bf00 100644 --- a/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepositoryTest.java +++ b/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/MongoDbEventPublicationRepositoryTest.java @@ -40,7 +40,7 @@ import org.springframework.test.context.ContextConfiguration; */ @DataMongoTest @ContextConfiguration(classes = TestApplication.class) -class MongoDbEventPublicationRepositoryTest extends WithEmbeddedMongoDb { +class MongoDbEventPublicationRepositoryTest { private static final PublicationTargetIdentifier TARGET_IDENTIFIER = PublicationTargetIdentifier.of("listener"); diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/WithEmbeddedMongoDb.java b/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/WithEmbeddedMongoDb.java deleted file mode 100644 index d9bedff5..00000000 --- a/spring-modulith-events/spring-modulith-events-mongodb/src/test/java/org/springframework/modulith/events/mongodb/WithEmbeddedMongoDb.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2022 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 - * - * 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 org.springframework.modulith.events.mongodb; - -import de.flapdoodle.embed.mongo.MongodProcess; -import de.flapdoodle.embed.mongo.MongodStarter; -import de.flapdoodle.embed.mongo.config.ImmutableMongodConfig; -import de.flapdoodle.embed.mongo.config.MongodConfig; -import de.flapdoodle.embed.mongo.config.Net; -import de.flapdoodle.embed.mongo.distribution.Version; -import de.flapdoodle.embed.process.runtime.Network; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.context.ContextConfiguration; - -import com.mongodb.client.MongoClient; -import com.mongodb.client.MongoClients; - -/** - * Setup of embedded MongoDB as Spring beans so that it will properly bound to and shut down with an - * {@link ApplicationContext}. - * - * @author Oliver Drotbohm - */ -@ContextConfiguration(classes = WithEmbeddedMongoDb.TestConfiguration.class) -abstract class WithEmbeddedMongoDb { - - @Configuration - static class TestConfiguration { - - @Bean - Net mongoDbConfig() throws Exception { - return new Net("localhost", Network.freeServerPort(Network.getLocalHost()), false); - } - - @Bean(destroyMethod = "stop") - MongodProcess mongoDbProcess(Net config) throws Exception { - - ImmutableMongodConfig mongodConfig = MongodConfig.builder() - .version(Version.Main.PRODUCTION) - .net(config) - .build(); - - return MongodStarter.getDefaultInstance() - .prepare(mongodConfig) - .start(); - } - - @Bean - // Artificially depend on MongodProcess so that it will not shut down prior - // to the repository -> template -> client -> process shutdown chain - MongoClient mongoDbClient(Net config, MongodProcess process) { - return MongoClients.create("mongodb://" + config.getBindIp() + ":" + config.getPort()); - } - } -} diff --git a/spring-modulith-events/spring-modulith-events-mongodb/src/test/resources/application.properties b/spring-modulith-events/spring-modulith-events-mongodb/src/test/resources/application.properties new file mode 100644 index 00000000..567d45c7 --- /dev/null +++ b/spring-modulith-events/spring-modulith-events-mongodb/src/test/resources/application.properties @@ -0,0 +1,3 @@ +# Flapdoodle +de.flapdoodle.mongodb.embedded.version=6.0.3 +logging.level.de.flapdoodle.embed.mongo=WARN