Skip to content
This repository was archived by the owner on Dec 4, 2025. It is now read-only.

Commit 6aa1017

Browse files
committed
Refine Spring Boot 2.6 upgrade
- Change version to 0.5.0-SNAPSHOT - Upgrade to Spring Boot 2.6.2 - Upgrade to Kotlin 1.6.10 - Upgrade to Gradle 7.3.3 - Embedded MongoDB version is now mandatory - Use nicer Testcontainer syntax with Kotlin 1.6 Closes gh-383
1 parent 2b3fbac commit 6aa1017

File tree

34 files changed

+86
-83
lines changed

34 files changed

+86
-83
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
id("org.jetbrains.kotlin.jvm") version "1.5.21" apply false
4+
id("org.jetbrains.kotlin.jvm") version "1.6.10" apply false
55
id("org.springframework.boot") apply false
6-
id("org.jetbrains.dokka") version "1.5.0" apply false
6+
id("org.jetbrains.dokka") version "1.6.10" apply false
77
id("io.spring.dependency-management") version "1.0.11.RELEASE"
88
id("maven-publish")
99
}
@@ -14,7 +14,7 @@ allprojects {
1414
plugin("io.spring.dependency-management")
1515
}
1616

17-
version = "0.4.5-SNAPSHOT"
17+
version = "0.5.0-SNAPSHOT"
1818
group = "org.springframework.fu"
1919

2020
dependencyManagement {

gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
bootVersion=2.6.0
2-
1+
bootVersion=2.6.2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

jafu/src/main/java/org/springframework/fu/jafu/mongo/ReactiveMongoDsl.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public ReactiveMongoDsl uri(String uri) {
6565
*
6666
* Require {@code de.flapdoodle.embed:de.flapdoodle.embed.mongo} dependency.
6767
*/
68-
public ReactiveMongoDsl embedded() {
69-
new EmbeddedMongoDsl(properties, it -> {}).initialize(context);
68+
public ReactiveMongoDsl embedded(IFeatureAwareVersion version) {
69+
new EmbeddedMongoDsl(properties, version, it -> {}).initialize(context);
7070
embedded = true;
7171
return this;
7272
}
@@ -76,8 +76,8 @@ public ReactiveMongoDsl embedded() {
7676
*
7777
* Require {@code de.flapdoodle.embed:de.flapdoodle.embed.mongo} dependency.
7878
*/
79-
public ReactiveMongoDsl embedded(Consumer<EmbeddedMongoDsl> dsl) {
80-
new EmbeddedMongoDsl(properties, dsl).initialize(context);
79+
public ReactiveMongoDsl embedded(IFeatureAwareVersion version, Consumer<EmbeddedMongoDsl> dsl) {
80+
new EmbeddedMongoDsl(properties, version, dsl).initialize(context);
8181
embedded = true;
8282
return this;
8383
}
@@ -103,9 +103,10 @@ public static class EmbeddedMongoDsl extends AbstractDsl {
103103
private final MongoProperties mongoProperties;
104104
private final EmbeddedMongoProperties embeddedMongoProperties = new EmbeddedMongoProperties();
105105

106-
EmbeddedMongoDsl(MongoProperties properties, Consumer<EmbeddedMongoDsl> dsl) {
106+
EmbeddedMongoDsl(MongoProperties properties, IFeatureAwareVersion version, Consumer<EmbeddedMongoDsl> dsl) {
107107
this.dsl = dsl;
108108
this.mongoProperties = properties;
109+
this.embeddedMongoProperties.setVersion(version.asInDownloadPath());
109110
}
110111

111112
/**

kofu/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ dependencies {
5353
testImplementation("org.springframework.boot:spring-boot-starter-security")
5454
testImplementation("org.springframework.security:spring-security-test")
5555
testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin")
56-
testRuntimeOnly("de.flapdoodle.embed:de.flapdoodle.embed.mongo")
56+
testImplementation("de.flapdoodle.embed:de.flapdoodle.embed.mongo")
5757
testImplementation("io.mockk:mockk:1.9")
5858
testImplementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
5959
testImplementation("javax.servlet:javax.servlet-api")

kofu/src/main/kotlin/org/springframework/fu/kofu/mongo/AbstractMongoDsl.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,21 @@ abstract class AbstractMongoDsl(private val init: MongoDsl.() -> Unit) : Abstrac
5454
*
5555
* @sample org.springframework.fu.kofu.samples.mongoEmbedded
5656
*/
57-
fun embedded(dsl: EmbeddedMongoDsl.() -> Unit = {}) {
57+
fun embedded(version: IFeatureAwareVersion, dsl: EmbeddedMongoDsl.() -> Unit = {}) {
5858
embedded = true
59-
EmbeddedMongoDsl(properties, dsl).initialize(context)
59+
EmbeddedMongoDsl(properties, version, dsl).initialize(context)
6060
}
6161

6262
/**
6363
* Kofu DSL for embedded MongoDB configuration.
6464
*/
65-
class EmbeddedMongoDsl(private val mongoProperties: MongoProperties, private val init: EmbeddedMongoDsl.() -> Unit) : AbstractDsl() {
65+
class EmbeddedMongoDsl(private val mongoProperties: MongoProperties, version: IFeatureAwareVersion, private val init: EmbeddedMongoDsl.() -> Unit) : AbstractDsl() {
6666

6767
private val embeddedMongoProperties = EmbeddedMongoProperties()
6868

6969
override fun initialize(context: GenericApplicationContext) {
7070
super.initialize(context)
71+
embeddedMongoProperties.version = version.asInDownloadPath()
7172
init()
7273
EmbeddedMongoInitializer(mongoProperties, embeddedMongoProperties).initialize(context)
7374
}

kofu/src/test/kotlin/org/springframework/fu/kofu/mongo/EmbeddedMongoDslTests.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.fu.kofu.mongo
1818

19+
import de.flapdoodle.embed.mongo.distribution.Version
1920
import org.junit.jupiter.api.Assertions.assertEquals
2021
import org.junit.jupiter.api.Test
2122
import org.springframework.beans.factory.getBean
@@ -38,7 +39,7 @@ class EmbeddedMongoModuleTests {
3839
}
3940
reactiveMongodb {
4041
uri = "mongodb://localhost:$port/test"
41-
embedded()
42+
embedded(Version.Main.PRODUCTION)
4243
}
4344
}
4445
with(app.run()){
@@ -58,7 +59,7 @@ class EmbeddedMongoModuleTests {
5859
}
5960
mongodb() {
6061
uri = "mongodb://localhost:$port/test"
61-
embedded()
62+
embedded(Version.Main.PRODUCTION)
6263
}
6364
}
6465
with(app.run()){

kofu/src/test/kotlin/org/springframework/fu/kofu/samples/mongodb.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.springframework.fu.kofu.samples
22

3+
import de.flapdoodle.embed.mongo.distribution.Version
34
import org.springframework.fu.kofu.application
45
import org.springframework.fu.kofu.mongo.reactiveMongodb
56

@@ -15,7 +16,7 @@ fun mongoEmbedded() {
1516
application {
1617
reactiveMongodb {
1718
uri = "mongodb://myserver.com/foo"
18-
embedded()
19+
embedded(version = Version.Main.PRODUCTION)
1920
}
2021
}
2122
}

kofu/src/test/kotlin/org/springframework/fu/kofu/webflux/WebFluxServerDslTests.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.fu.kofu.webflux
1818

19+
import de.flapdoodle.embed.mongo.distribution.Version
1920
import org.junit.jupiter.api.Assertions.assertEquals
2021
import org.junit.jupiter.api.Test
2122
import org.junit.jupiter.api.assertThrows
@@ -179,7 +180,7 @@ class WebFluxServerDslTests {
179180
level = LogLevel.DEBUG
180181
}
181182
reactiveMongodb {
182-
embedded()
183+
embedded(Version.Main.PRODUCTION)
183184
}
184185
}
185186
with(app.run()) {

samples/jafu-reactive-data-r2dbc/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("io.spring.dependency-management") version "1.0.11.RELEASE"
3-
id("org.springframework.boot") version "2.5.3"
3+
id("org.springframework.boot") version "2.6.2"
44
id("java")
55
}
66

@@ -10,7 +10,7 @@ java {
1010
}
1111

1212
dependencies {
13-
implementation("org.springframework.fu:spring-fu-jafu:0.4.5-SNAPSHOT")
13+
implementation("org.springframework.fu:spring-fu-jafu:0.5.0-SNAPSHOT")
1414

1515
implementation("org.springframework.boot:spring-boot-starter-webflux")
1616
implementation("org.springframework.boot:spring-boot-starter-mustache")

0 commit comments

Comments
 (0)