Skip to content

Commit 8d859f0

Browse files
committed
Fix issues with Kotlin examples in Antora docs
Signed-off-by: Dmitry Sulman <[email protected]>
1 parent d4bc07a commit 8d859f0

File tree

13 files changed

+51
-48
lines changed

13 files changed

+51
-48
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.springframework.boot.docs.features.testcontainers.atdevelopmenttime.devtools
16+
package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.devtools
1717

1818
import org.springframework.boot.devtools.restart.RestartScope
1919
import org.springframework.boot.test.context.TestConfiguration
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.testcontainers.atdevelopmenttime.dynamicproperties
17+
package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.dynamicproperties
1818

1919
import org.springframework.boot.test.context.TestConfiguration
2020
import org.springframework.context.annotation.Bean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright 2012-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.importingcontainerdeclarations
18+
19+
import org.springframework.boot.testcontainers.service.connection.ServiceConnection
20+
import org.testcontainers.containers.MongoDBContainer
21+
import org.testcontainers.containers.Neo4jContainer
22+
import org.testcontainers.junit.jupiter.Container
23+
24+
interface MyContainers {
25+
26+
companion object {
27+
28+
@Container
29+
@ServiceConnection
30+
@JvmField
31+
val mongoContainer = MongoDBContainer("mongo:5.0")
32+
33+
@Container
34+
@ServiceConnection
35+
@JvmField
36+
val neo4jContainer = Neo4jContainer("neo4j:5")
37+
38+
}
39+
40+
}
41+
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.testcontainers.atdevelopmenttime.importingcontainerdeclarations
17+
package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.importingcontainerdeclarations
1818

1919
import org.springframework.boot.test.context.TestConfiguration
2020
import org.springframework.boot.testcontainers.context.ImportTestcontainers
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.testcontainers.atdevelopmenttime.test
17+
package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.launch
1818

1919
import org.springframework.boot.autoconfigure.SpringBootApplication
2020
import org.springframework.boot.docs.features.springapplication.MyApplication
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.testcontainers.atdevelopmenttime.launch
17+
package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.launch
1818

1919
import org.springframework.boot.fromApplication
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.testcontainers.atdevelopmenttime.launch
17+
package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.test
1818

1919
import org.springframework.boot.autoconfigure.SpringBootApplication
2020
import org.springframework.boot.docs.features.springapplication.MyApplication
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.testcontainers.atdevelopmenttime.test
17+
package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.test
1818

1919
import org.springframework.boot.test.context.TestConfiguration
2020
import org.springframework.boot.testcontainers.service.connection.ServiceConnection
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.features.testcontainers.atdevelopmenttime.test
17+
package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.test
1818

1919
import org.springframework.boot.fromApplication
2020
import org.springframework.boot.with

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/testcontainers/atdevelopmenttime/importingcontainerdeclarations/MyContainers.kt

Lines changed: 0 additions & 20 deletions
This file was deleted.

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesKotlin.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package org.springframework.boot.docs.packaging.nativeimage.advanced.nestedconfi
1818

1919
import org.springframework.boot.context.properties.ConfigurationProperties
2020
import org.springframework.boot.context.properties.NestedConfigurationProperty
21+
import org.springframework.boot.docs.packaging.nativeimage.advanced.nestedconfigurationproperties.nested.Nested
2122

2223
@ConfigurationProperties("my.properties")
2324
data class MyPropertiesKotlin(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.docs.packaging.nativeimage.advanced.nestedconfigurationproperties
17+
package org.springframework.boot.docs.packaging.nativeimage.advanced.nestedconfigurationproperties.nested
1818

1919
class Nested {
2020
}

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/errorpageswithoutspringmvc/SomeController.kt

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)