Skip to content

Commit cf660a6

Browse files
committed
Fix spring-boot-docs Kotlin examples
Signed-off-by: Dmitry Sulman <[email protected]>
1 parent af926e2 commit cf660a6

File tree

14 files changed

+38
-67
lines changed

14 files changed

+38
-67
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,25 @@
1+
package org.springframework.boot.docs.features.devservices.testcontainers.atdevelopmenttime.importingcontainerdeclarations
2+
3+
import org.springframework.boot.testcontainers.service.connection.ServiceConnection
4+
import org.testcontainers.containers.MongoDBContainer
5+
import org.testcontainers.containers.Neo4jContainer
6+
import org.testcontainers.junit.jupiter.Container
7+
8+
interface MyContainers {
9+
10+
companion object {
11+
12+
@Container
13+
@ServiceConnection
14+
@JvmField
15+
val mongoContainer = MongoDBContainer("mongo:5.0")
16+
17+
@Container
18+
@ServiceConnection
19+
@JvmField
20+
val neo4jContainer = Neo4jContainer("neo4j:5")
21+
22+
}
23+
24+
}
25+
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(

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

Lines changed: 0 additions & 20 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.springframework.boot.docs.packaging.nativeimage.advanced.nestedconfigurationproperties.nested
2+
3+
class Nested {
4+
}

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)